mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Import the util crate as util rather than servo_util.
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:
parent
221a343883
commit
505159a464
182 changed files with 294 additions and 294 deletions
|
@ -7,8 +7,8 @@
|
|||
use dom::bindings::trace::JSTraceable;
|
||||
use js::jsapi::{JSTracer};
|
||||
|
||||
use servo_util::task_state;
|
||||
use servo_util::task_state::{SCRIPT, IN_GC};
|
||||
use util::task_state;
|
||||
use util::task_state::{SCRIPT, IN_GC};
|
||||
|
||||
use std::cell::{RefCell, Ref, RefMut};
|
||||
|
||||
|
|
|
@ -1677,7 +1677,7 @@ def UnionTypes(descriptors, dictionaries, callbacks, config):
|
|||
'dom::types::*',
|
||||
'js::jsapi::JSContext',
|
||||
'js::jsval::JSVal',
|
||||
'servo_util::str::DOMString',
|
||||
'util::str::DOMString',
|
||||
]
|
||||
|
||||
# Now find all the things we'll need as arguments and return values because
|
||||
|
@ -4587,7 +4587,7 @@ class CGBindingRoot(CGThing):
|
|||
'dom::bindings::str::ByteString',
|
||||
'page::JSPageInfo',
|
||||
'libc',
|
||||
'servo_util::str::DOMString',
|
||||
'util::str::DOMString',
|
||||
'std::borrow::ToOwned',
|
||||
'std::cmp',
|
||||
'std::iter::repeat',
|
||||
|
|
|
@ -8,7 +8,7 @@ use dom::bindings::codegen::PrototypeList;
|
|||
use dom::bindings::js::{JS, JSRef, Root};
|
||||
use dom::bindings::str::ByteString;
|
||||
use dom::bindings::utils::{Reflectable, Reflector, DOMClass};
|
||||
use servo_util::str::DOMString;
|
||||
use util::str::DOMString;
|
||||
|
||||
use js;
|
||||
use js::glue::{RUST_JSID_TO_STRING, RUST_JSID_IS_STRING};
|
||||
|
|
|
@ -52,7 +52,7 @@ use js::jsval::JSVal;
|
|||
use layout_interface::TrustedNodeAddress;
|
||||
use script_task::STACK_ROOTS;
|
||||
|
||||
use servo_util::smallvec::{SmallVec, SmallVec16};
|
||||
use util::smallvec::{SmallVec, SmallVec16};
|
||||
use std::cell::{Cell, UnsafeCell};
|
||||
use std::default::Default;
|
||||
use std::marker::ContravariantLifetime;
|
||||
|
|
|
@ -47,8 +47,8 @@ use script_traits::ScriptControlChan;
|
|||
use script_traits::UntrustedNodeAddress;
|
||||
use servo_msg::compositor_msg::ScriptListener;
|
||||
use servo_msg::constellation_msg::ConstellationChan;
|
||||
use servo_util::smallvec::{SmallVec1, SmallVec};
|
||||
use servo_util::str::{LengthOrPercentageOrAuto};
|
||||
use util::smallvec::{SmallVec1, SmallVec};
|
||||
use util::str::{LengthOrPercentageOrAuto};
|
||||
use std::cell::{Cell, RefCell};
|
||||
use std::collections::HashMap;
|
||||
use std::collections::hash_state::HashState;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue