Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-16 02:45:36 +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

2
ports/cef/browser.rs
View file

@ -15,7 +15,7 @@ use window;
use compositing::windowing::{WindowNavigateMsg, WindowEvent};
use glutin_app;
use libc::c_int;
use servo_util::opts;
use util::opts;
use std::borrow::ToOwned;
use std::cell::{Cell, RefCell};
use std::sync::atomic::{AtomicInt, Ordering};

2
ports/cef/core.rs
View file

@ -8,7 +8,7 @@ use types::{cef_main_args_t, cef_settings_t};
use geom::size::TypedSize2D;
use libc::{c_char, c_int, c_void};
use servo_util::opts;
use util::opts;
use std::borrow::ToOwned;
use std::ffi;
use std::str;

2
ports/cef/lib.rs
View file

@ -27,7 +27,7 @@ extern crate script;
extern crate "net" as servo_net;
extern crate "msg" as servo_msg;
extern crate "util" as servo_util;
extern crate util;
extern crate style;
extern crate stb_image;

4
ports/cef/window.rs
View file

@ -24,8 +24,8 @@ use libc::{c_char, c_void};
use servo_msg::constellation_msg::{Key, KeyModifiers};
use servo_msg::compositor_msg::{ReadyState, PaintState};
use servo_msg::constellation_msg::LoadData;
use servo_util::cursor::Cursor;
use servo_util::geometry::ScreenPx;
use util::cursor::Cursor;
use util::geometry::ScreenPx;
use std::cell::RefCell;
use std::ffi::CString;
use std::rc::Rc;

12
ports/gonk/src/lib.rs
View file

@ -15,7 +15,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;
@ -44,13 +44,13 @@ use servo_net::resource_task::new_resource_task;
#[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;
@ -66,7 +66,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();

4
ports/gonk/src/main.rs
View file

@ -7,7 +7,7 @@
extern crate servo;
extern crate time;
extern crate "util" as servo_util;
extern crate util;
extern crate compositing;
@ -18,7 +18,7 @@ extern crate gleam;
extern crate layers;
extern crate egl;
use servo_util::opts;
use util::opts;
use servo::Browser;
use compositing::windowing::WindowEvent;

4
ports/gonk/src/window.rs
View file

@ -21,8 +21,8 @@ use std::mem::transmute;
use std::mem::size_of;
use std::mem::zeroed;
use std::ptr;
use servo_util::cursor::Cursor;
use servo_util::geometry::ScreenPx;
use util::cursor::Cursor;
use util::geometry::ScreenPx;
use gleam::gl;
use egl::egl::EGLConfig;