Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Import the util crate as util rather than servo_util.

Browse source 
This used to conflict with the util crate from the standard library, which
has long since been removed.

The import in layout has not been changed because of a conflict with the
util mod there.
This commit is contained in:
Ms2ger 2015-01-29 12:16:41 +01:00
parent 221a343883
commit 505159a464
182 changed files with 294 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/servo/lib.rs
View file

@ -17,7 +17,7 @@ extern crate devtools;
extern crate "net" as servo_net;
extern crate "msg" as servo_msg;
#[macro_use]
extern crate "util" as servo_util;
extern crate util;
extern crate script;
extern crate layout;
extern crate gfx;
@ -45,13 +45,13 @@ use servo_net::storage_task::{StorageTaskFactory, StorageTask};
#[cfg(not(test))]
use gfx::font_cache_task::FontCacheTask;
#[cfg(not(test))]
use servo_util::time::TimeProfiler;
use util::time::TimeProfiler;
#[cfg(not(test))]
use servo_util::memory::MemoryProfiler;
use util::memory::MemoryProfiler;
#[cfg(not(test))]
use servo_util::opts;
use util::opts;
#[cfg(not(test))]
use servo_util::taskpool::TaskPool;
use util::taskpool::TaskPool;
#[cfg(not(test))]
use std::os;
@ -69,7 +69,7 @@ pub struct Browser<Window> {
impl<Window> Browser<Window> where Window: WindowMethods + 'static {
#[cfg(not(test))]
pub fn new(window: Option<Rc<Window>>) -> Browser<Window> {
::servo_util::opts::set_experimental_enabled(opts::get().enable_experimental);
::util::opts::set_experimental_enabled(opts::get().enable_experimental);
let opts = opts::get();
RegisterBindings::RegisterProxyHandlers();

6
components/servo/main.rs
View file

@ -11,7 +11,7 @@ extern crate libc;
extern crate servo;
extern crate time;
extern crate "util" as servo_util;
extern crate util;
#[cfg(all(feature = "glutin_app",not(test)))]
extern crate "glutin_app" as app;
@ -29,7 +29,7 @@ extern crate android_glue;
use libc::c_int;
#[cfg(not(test))]
use servo_util::opts;
use util::opts;
#[cfg(not(test))]
use servo::Browser;
@ -74,7 +74,7 @@ fn redirect_output(file_no: c_int) {
use libc::funcs::posix88::unistd::{pipe, dup2};
use libc::funcs::posix88::stdio::fdopen;
use libc::funcs::c95::stdio::fgets;
use servo_util::task::spawn_named;
use util::task::spawn_named;
use std::mem;
use std::ffi::CString;
use std::str::from_utf8;