servo: Merge #4766 - Import the util crate as util rather than servo_util (from Ms2ger:util); r=Manishearth

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.

Source-Repo: https://github.com/servo/servo
Source-Revision: 27e0f16407629422b5e047e067d458142372c97e

servo/components/canvas/canvas_paint_task.rs

@@ -6,7 +6,7 @@ use azure::azure_hl::{DrawTarget, Color, SurfaceFormat, BackendType, StrokeOptio
 use azure::azure_hl::{ColorPattern, PatternRef};
 use geom::rect::Rect;
 use geom::size::Size2D;
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
 
 use std::borrow::ToOwned;
 use std::sync::mpsc::{channel, Sender};

servo/components/canvas/lib.rs

@@ -9,6 +9,6 @@
 
 extern crate azure;
 extern crate geom;
-extern crate "util" as servo_util;
+extern crate util;
 
 pub mod canvas_paint_task;

servo/components/compositing/compositor.rs

@@ -35,11 +35,11 @@ use servo_msg::constellation_msg::{ConstellationChan, NavigationDirection};
 use servo_msg::constellation_msg::Msg as ConstellationMsg;
 use servo_msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData};
 use servo_msg::constellation_msg::{PipelineId, WindowSizeData};
-use servo_util::geometry::{PagePx, ScreenPx, ViewportPx};
+use util::geometry::{PagePx, ScreenPx, ViewportPx};
-use servo_util::memory::MemoryProfilerChan;
+use util::memory::MemoryProfilerChan;
-use servo_util::opts;
+use util::opts;
-use servo_util::time::{TimeProfilerCategory, profile, TimeProfilerChan};
+use util::time::{TimeProfilerCategory, profile, TimeProfilerChan};
-use servo_util::{memory, time};
+use util::{memory, time};
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::path::Path;

servo/components/compositing/compositor_task.rs

@@ -22,10 +22,10 @@ use servo_msg::compositor_msg::{Epoch, LayerId, LayerMetadata, ReadyState};
 use servo_msg::compositor_msg::{PaintListener, PaintState, ScriptListener, ScrollPolicy};
 use servo_msg::constellation_msg::{ConstellationChan, LoadData, PipelineId};
 use servo_msg::constellation_msg::{Key, KeyState, KeyModifiers};
-use servo_util::cursor::Cursor;
+use util::cursor::Cursor;
-use servo_util::geometry::PagePx;
+use util::geometry::PagePx;
-use servo_util::memory::MemoryProfilerChan;
+use util::memory::MemoryProfilerChan;
-use servo_util::time::TimeProfilerChan;
+use util::time::TimeProfilerChan;
 use std::sync::mpsc::{channel, Sender, Receiver};
 use std::fmt::{Error, Formatter, Show};
 use std::rc::Rc;

servo/components/compositing/constellation.rs

@@ -28,11 +28,11 @@ use servo_net::image_cache_task::{ImageCacheTask, ImageCacheTaskClient};
 use servo_net::resource_task::ResourceTask;
 use servo_net::resource_task;
 use servo_net::storage_task::{StorageTask, StorageTaskMsg};
-use servo_util::cursor::Cursor;
+use util::cursor::Cursor;
-use servo_util::geometry::{PagePx, ViewportPx};
+use util::geometry::{PagePx, ViewportPx};
-use servo_util::opts;
+use util::opts;
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
-use servo_util::time::TimeProfilerChan;
+use util::time::TimeProfilerChan;
 use std::borrow::ToOwned;
 use std::cell::{Cell, RefCell};
 use std::collections::{HashMap, HashSet};

servo/components/compositing/headless.rs

@@ -9,10 +9,10 @@ use geom::scale_factor::ScaleFactor;
 use geom::size::TypedSize2D;
 use servo_msg::constellation_msg::Msg as ConstellationMsg;
 use servo_msg::constellation_msg::{ConstellationChan, WindowSizeData};
-use servo_util::memory::MemoryProfilerChan;
+use util::memory::MemoryProfilerChan;
-use servo_util::memory;
+use util::memory;
-use servo_util::time::TimeProfilerChan;
+use util::time::TimeProfilerChan;
-use servo_util::time;
+use util::time;
 
 /// Starts the compositor, which listens for messages on the specified port.
 ///

servo/components/compositing/lib.rs

@@ -24,7 +24,7 @@ extern crate script_traits;
 extern crate "msg" as servo_msg;
 extern crate "net" as servo_net;
 #[macro_use]
-extern crate "util" as servo_util;
+extern crate util;
 extern crate gleam;
 
 extern crate libc;

servo/components/compositing/pipeline.rs

@@ -16,7 +16,7 @@ use servo_net::image_cache_task::ImageCacheTask;
 use gfx::font_cache_task::FontCacheTask;
 use servo_net::resource_task::ResourceTask;
 use servo_net::storage_task::StorageTask;
-use servo_util::time::TimeProfilerChan;
+use util::time::TimeProfilerChan;
 use std::rc::Rc;
 use std::sync::mpsc::{Receiver, channel};
 

servo/components/compositing/windowing.rs

@@ -13,8 +13,8 @@ use layers::geometry::DevicePixel;
 use layers::platform::surface::NativeGraphicsMetadata;
 use servo_msg::compositor_msg::{PaintState, ReadyState};
 use servo_msg::constellation_msg::{Key, KeyState, KeyModifiers, LoadData};
-use servo_util::cursor::Cursor;
+use util::cursor::Cursor;
-use servo_util::geometry::ScreenPx;
+use util::geometry::ScreenPx;
 use std::fmt::{Error, Formatter, Show};
 use std::rc::Rc;
 

servo/components/devtools/lib.rs

@@ -25,7 +25,7 @@ extern crate devtools_traits;
 extern crate "serialize" as rustc_serialize;
 extern crate serialize;
 extern crate "msg" as servo_msg;
-extern crate "util" as servo_util;
+extern crate util;
 
 use actor::{Actor, ActorRegistry};
 use actors::console::ConsoleActor;
@@ -36,7 +36,7 @@ use protocol::JsonPacketStream;
 
 use devtools_traits::{ServerExitMsg, DevtoolsControlMsg, NewGlobal, DevtoolScriptControlMsg, DevtoolsPageInfo};
 use servo_msg::constellation_msg::PipelineId;
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
 
 use std::borrow::ToOwned;
 use std::cell::RefCell;

servo/components/devtools_traits/lib.rs

@@ -18,7 +18,7 @@
 extern crate "msg" as servo_msg;
 extern crate serialize;
 extern crate url;
-extern crate "util" as servo_util;
+extern crate util;
 
 pub use self::DevtoolsControlMsg::*;
 pub use self::DevtoolScriptControlMsg::*;
@@ -26,7 +26,7 @@ pub use self::EvaluateJSReply::*;
 
 use serialize::{Decodable, Decoder};
 use servo_msg::constellation_msg::PipelineId;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 use url::Url;
 
 use std::sync::mpsc::{Sender, Receiver};

servo/components/gfx/display_list/mod.rs

@@ -32,11 +32,11 @@ use libc::uintptr_t;
 use paint_task::PaintLayer;
 use servo_msg::compositor_msg::LayerId;
 use servo_net::image::base::Image;
-use servo_util::cursor::Cursor;
+use util::cursor::Cursor;
-use servo_util::dlist as servo_dlist;
+use util::dlist as servo_dlist;
-use servo_util::geometry::{self, Au, MAX_RECT, ZERO_RECT};
+use util::geometry::{self, Au, MAX_RECT, ZERO_RECT};
-use servo_util::range::Range;
+use util::range::Range;
-use servo_util::smallvec::{SmallVec, SmallVec8};
+use util::smallvec::{SmallVec, SmallVec8};
 use std::fmt;
 use std::slice::Iter;
 use std::sync::Arc;

servo/components/gfx/display_list/optimizer.rs

@@ -8,7 +8,7 @@ use display_list::{DisplayItem, DisplayList, StackingContext};
 
 use collections::dlist::DList;
 use geom::rect::Rect;
-use servo_util::geometry::{self, Au};
+use util::geometry::{self, Au};
 use std::sync::Arc;
 
 /// Transforms a display list to produce a visually-equivalent, but cheaper-to-paint, one.

servo/components/gfx/font.rs

@@ -8,8 +8,8 @@ use std::mem;
 use std::slice;
 use std::rc::Rc;
 use std::cell::RefCell;
-use servo_util::cache::HashCache;
+use util::cache::HashCache;
-use servo_util::smallvec::{SmallVec, SmallVec8};
+use util::smallvec::{SmallVec, SmallVec8};
 use style::computed_values::{font_stretch, font_variant, font_weight};
 use style::style_structs::Font as FontStyle;
 use std::sync::Arc;
@@ -17,7 +17,7 @@ use std::sync::Arc;
 use std::hash::Hash;
 use platform::font_context::FontContextHandle;
 use platform::font::{FontHandle, FontTable};
-use servo_util::geometry::Au;
+use util::geometry::Au;
 use text::glyph::{GlyphStore, GlyphId};
 use text::shaping::ShaperMethods;
 use text::{Shaper, TextRun};

servo/components/gfx/font_cache_task.rs

@@ -16,8 +16,8 @@ use std::sync::mpsc::{Sender, Receiver, channel};
 use font_template::{FontTemplate, FontTemplateDescriptor};
 use platform::font_template::FontTemplateData;
 use servo_net::resource_task::{ResourceTask, load_whole_resource};
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
-use servo_util::str::LowercaseString;
+use util::str::LowercaseString;
 use style::Source;
 
 /// A list of font templates that make up a given font family.

servo/components/gfx/font_context.rs

@@ -12,10 +12,10 @@ use font_template::FontTemplateDescriptor;
 use platform::font_template::FontTemplateData;
 use font::FontHandleMethods;
 use platform::font::FontHandle;
-use servo_util::cache::HashCache;
+use util::cache::HashCache;
-use servo_util::smallvec::{SmallVec, SmallVec8};
+use util::smallvec::{SmallVec, SmallVec8};
-use servo_util::geometry::Au;
+use util::geometry::Au;
-use servo_util::arc_ptr_eq;
+use util::arc_ptr_eq;
 
 use std::borrow::ToOwned;
 use std::rc::Rc;

servo/components/gfx/lib.rs

@@ -26,7 +26,7 @@ extern crate unicode;
 extern crate "plugins" as servo_plugins;
 extern crate "net" as servo_net;
 #[macro_use]
-extern crate "util" as servo_util;
+extern crate util;
 extern crate "msg" as servo_msg;
 extern crate style;
 extern crate time;

servo/components/gfx/paint_context.rs

@@ -26,9 +26,9 @@ use libc::size_t;
 use libc::types::common::c99::{uint16_t, uint32_t};
 use png::PixelsByColorType;
 use servo_net::image::base::Image;
-use servo_util::geometry::{Au, MAX_RECT};
+use util::geometry::{Au, MAX_RECT};
-use servo_util::opts;
+use util::opts;
-use servo_util::range::Range;
+use util::range::Range;
 use std::default::Default;
 use std::f32;
 use std::mem;

servo/components/gfx/paint_task.rs

@@ -25,12 +25,12 @@ use servo_msg::compositor_msg::{LayerMetadata, PaintListener, ScrollPolicy};
 use servo_msg::constellation_msg::Msg as ConstellationMsg;
 use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId};
 use servo_msg::constellation_msg::PipelineExitType;
-use servo_util::geometry::{Au, ZERO_POINT};
+use util::geometry::{Au, ZERO_POINT};
-use servo_util::opts;
+use util::opts;
-use servo_util::smallvec::SmallVec;
+use util::smallvec::SmallVec;
-use servo_util::task::spawn_named_with_send_on_failure;
+use util::task::spawn_named_with_send_on_failure;
-use servo_util::task_state;
+use util::task_state;
-use servo_util::time::{TimeProfilerChan, TimeProfilerCategory, profile};
+use util::time::{TimeProfilerChan, TimeProfilerCategory, profile};
 use std::mem;
 use std::thread::Builder;
 use std::sync::Arc;

servo/components/gfx/platform/freetype/font.rs

@@ -6,9 +6,9 @@ extern crate freetype;
 
 use font::{FontHandleMethods, FontMetrics, FontTableMethods};
 use font::{FontTableTag, FractionalPixel};
-use servo_util::geometry::Au;
+use util::geometry::Au;
-use servo_util::geometry;
+use util::geometry;
-use servo_util::str::c_str_to_string;
+use util::str::c_str_to_string;
 use platform::font_context::FontContextHandle;
 use text::glyph::GlyphId;
 use text::util::{float_to_fixed, fixed_to_float};

servo/components/gfx/platform/freetype/font_list.rs

@@ -20,7 +20,7 @@ use fontconfig::fontconfig::{
     FcObjectSetAdd, FcPatternGetInteger
 };
 
-use servo_util::str::c_str_to_string;
+use util::str::c_str_to_string;
 
 use libc;
 use libc::{c_int, c_char};

servo/components/gfx/platform/macos/font.rs

@@ -11,8 +11,8 @@ extern crate core_text;
 use font::{FontHandleMethods, FontMetrics, FontTableMethods};
 use font::FontTableTag;
 use font::FractionalPixel;
-use servo_util::geometry::{Au, px_to_pt};
+use util::geometry::{Au, px_to_pt};
-use servo_util::geometry;
+use util::geometry;
 use platform::macos::font_context::FontContextHandle;
 use text::glyph::GlyphId;
 use style::computed_values::{font_stretch, font_weight};

servo/components/gfx/text/glyph.rs

@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use servo_util::vec::*;
+use util::vec::*;
-use servo_util::range;
+use util::range;
-use servo_util::range::{Range, RangeIndex, EachIndex};
+use util::range::{Range, RangeIndex, EachIndex};
-use servo_util::geometry::Au;
+use util::geometry::Au;
 
 use std::cmp::{Ordering, PartialOrd};
 use std::iter::repeat;

servo/components/gfx/text/shaping/harfbuzz.rs

@@ -40,8 +40,8 @@ use harfbuzz::{hb_glyph_position_t};
 use harfbuzz::{hb_position_t, hb_tag_t};
 use harfbuzz::{RUST_hb_shape, RUST_hb_buffer_get_glyph_infos};
 use libc::{c_uint, c_int, c_void, c_char};
-use servo_util::geometry::Au;
+use util::geometry::Au;
-use servo_util::range::Range;
+use util::range::Range;
 use std::char;
 use std::iter::repeat;
 use std::mem;

servo/components/gfx/text/text_run.rs

@@ -5,9 +5,9 @@
 use font::{Font, FontHandleMethods, FontMetrics, IS_WHITESPACE_SHAPING_FLAG, RunMetrics};
 use font::{ShapingOptions};
 use platform::font_template::FontTemplateData;
-use servo_util::geometry::Au;
+use util::geometry::Au;
-use servo_util::range::Range;
+use util::range::Range;
-use servo_util::vec::{Comparator, FullBinarySearchMethods};
+use util::vec::{Comparator, FullBinarySearchMethods};
 use std::cmp::Ordering;
 use std::slice::Iter;
 use std::sync::Arc;

servo/components/layout_traits/lib.rs

@@ -10,7 +10,7 @@ extern crate gfx;
 extern crate script_traits;
 extern crate "msg" as servo_msg;
 extern crate "net" as servo_net;
-extern crate "util" as servo_util;
+extern crate util;
 
 // This module contains traits in layout used generically
 //   in the rest of Servo.
@@ -22,7 +22,7 @@ use gfx::paint_task::PaintChan;
 use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId, PipelineExitType};
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::ResourceTask;
-use servo_util::time::TimeProfilerChan;
+use util::time::TimeProfilerChan;
 use script_traits::{ScriptControlChan, OpaqueScriptLayoutChannel};
 use std::sync::mpsc::{Sender, Receiver};
 

servo/components/msg/constellation_msg.rs

@@ -11,8 +11,8 @@ use geom::scale_factor::ScaleFactor;
 use hyper::header::Headers;
 use hyper::method::Method;
 use layers::geometry::DevicePixel;
-use servo_util::cursor::Cursor;
+use util::cursor::Cursor;
-use servo_util::geometry::{PagePx, ViewportPx};
+use util::geometry::{PagePx, ViewportPx};
 use std::sync::mpsc::{channel, Sender, Receiver};
 use url::Url;
 

servo/components/msg/lib.rs

@@ -14,7 +14,7 @@ extern crate geom;
 extern crate hyper;
 extern crate layers;
 extern crate serialize;
-extern crate "util" as servo_util;
+extern crate util;
 extern crate url;
 
 #[cfg(target_os="macos")]

servo/components/net/about_loader.rs

@@ -8,7 +8,7 @@ use file_loader;
 
 use url::Url;
 use hyper::http::RawStatus;
-use servo_util::resource_files::resources_dir_path;
+use util::resource_files::resources_dir_path;
 
 use std::borrow::ToOwned;
 use std::io::fs::PathExtensions;

servo/components/net/file_loader.rs

@@ -9,7 +9,7 @@ use std::borrow::ToOwned;
 use std::io;
 use std::io::File;
 use std::sync::mpsc::Sender;
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
 
 static READ_SIZE: uint = 8192;
 

servo/components/net/http_loader.rs

@@ -14,7 +14,7 @@ use hyper::status::StatusClass;
 use std::error::Error;
 use std::io::Reader;
 use std::sync::mpsc::Sender;
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
 use url::{Url, UrlParser};
 
 use std::borrow::ToOwned;

servo/components/net/image_cache_task.rs

@@ -7,8 +7,8 @@ use resource_task;
 use resource_task::{LoadData, ResourceTask};
 use resource_task::ProgressMsg::{Payload, Done};
 
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
-use servo_util::taskpool::TaskPool;
+use util::taskpool::TaskPool;
 use std::borrow::ToOwned;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
@@ -484,7 +484,7 @@ mod tests {
     use resource_task::ProgressMsg::{Payload, Done};
     use sniffer_task;
     use image::base::test_image_bin;
-    use servo_util::taskpool::TaskPool;
+    use util::taskpool::TaskPool;
     use std::sync::mpsc::{Sender, channel, Receiver};
     use url::Url;
 

servo/components/net/lib.rs

@@ -18,7 +18,7 @@ extern crate png;
 #[macro_use]
 extern crate log;
 extern crate serialize;
-extern crate "util" as servo_util;
+extern crate util;
 extern crate stb_image;
 extern crate time;
 extern crate url;

servo/components/net/local_image_cache.rs

@@ -14,7 +14,7 @@ use std::borrow::ToOwned;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::sync::mpsc::{Receiver, channel};
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
 use url::Url;
 
 pub trait ImageResponder<NodeAddress: Send> {

servo/components/net/resource_task.rs

@@ -11,7 +11,7 @@ use http_loader;
 use sniffer_task;
 use sniffer_task::SnifferTask;
 
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
 
 use hyper::header::common::UserAgent;
 use hyper::header::Headers;

servo/components/net/storage_task.rs

@@ -8,8 +8,8 @@ use std::collections::BTreeMap;
 use std::sync::mpsc::{channel, Receiver, Sender};
 use url::Url;
 
-use servo_util::str::DOMString;
+use util::str::DOMString;
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
 
 /// Request operations on the storage data associated with a particular url
 pub enum StorageTaskMsg {

servo/components/script/dom/attr.rs

@@ -16,7 +16,7 @@ use dom::window::Window;
 use dom::virtualmethods::vtable_for;
 
 use devtools_traits::AttrInfo;
-use servo_util::str::{DOMString, split_html_space_chars};
+use util::str::{DOMString, split_html_space_chars};
 
 use string_cache::{Atom, Namespace};
 

servo/components/script/dom/bindings/cell.rs

@@ -7,8 +7,8 @@
 use dom::bindings::trace::JSTraceable;
 use js::jsapi::{JSTracer};
 
-use servo_util::task_state;
+use util::task_state;
-use servo_util::task_state::{SCRIPT, IN_GC};
+use util::task_state::{SCRIPT, IN_GC};
 
 use std::cell::{RefCell, Ref, RefMut};
 

servo/components/script/dom/bindings/codegen/CodegenRust.py

@@ -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',

servo/components/script/dom/bindings/conversions.rs

@@ -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};

servo/components/script/dom/bindings/js.rs

@@ -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;

servo/components/script/dom/bindings/trace.rs

@@ -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 util::smallvec::{SmallVec1, SmallVec};
-use servo_util::str::{LengthOrPercentageOrAuto};
+use util::str::{LengthOrPercentageOrAuto};
 use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
 use std::collections::hash_state::HashState;

servo/components/script/dom/blob.rs

@@ -10,7 +10,7 @@ use dom::bindings::error::Fallible;
 use dom::bindings::codegen::Bindings::BlobBinding;
 use dom::bindings::codegen::Bindings::BlobBinding::BlobMethods;
 
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;

servo/components/script/dom/characterdata.rs

@@ -14,7 +14,7 @@ use dom::document::Document;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::node::{Node, NodeHelpers, NodeTypeId};
 
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::borrow::ToOwned;
 use std::cell::Ref;

servo/components/script/dom/comment.rs

@@ -12,7 +12,7 @@ use dom::characterdata::CharacterData;
 use dom::document::Document;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 /// An HTML comment.
 #[dom_struct]

servo/components/script/dom/console.rs

@@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::ConsoleBinding::ConsoleMethods;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct Console {

servo/components/script/dom/create.rs

@@ -75,7 +75,7 @@ use dom::htmlulistelement::HTMLUListElement;
 use dom::htmlunknownelement::HTMLUnknownElement;
 use dom::htmlvideoelement::HTMLVideoElement;
 
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use string_cache::QualName;
 

servo/components/script/dom/cssstyledeclaration.rs

@@ -15,7 +15,7 @@ use dom::element::{Element, ElementHelpers, StylePriority};
 use dom::htmlelement::HTMLElement;
 use dom::node::{window_from_node, document_from_node, NodeDamage, Node};
 use dom::window::Window;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 use string_cache::Atom;
 use style::{is_supported_property, longhands_from_shorthand, parse_style_attribute};
 use style::PropertyDeclaration;

servo/components/script/dom/customevent.rs

@@ -13,7 +13,7 @@ use dom::bindings::utils::reflect_dom_object;
 use dom::event::{Event, EventTypeId};
 use js::jsapi::JSContext;
 use js::jsval::{JSVal, NullValue};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct CustomEvent {

servo/components/script/dom/dedicatedworkerglobalscope.rs

@@ -23,9 +23,9 @@ use script_task::{ScriptTask, ScriptChan, ScriptMsg, TimerSource};
 use script_task::StackRootTLS;
 
 use servo_net::resource_task::{ResourceTask, load_whole_resource};
-use servo_util::task::spawn_named;
+use util::task::spawn_named;
-use servo_util::task_state;
+use util::task_state;
-use servo_util::task_state::{SCRIPT, IN_WORKER};
+use util::task_state::{SCRIPT, IN_WORKER};
 
 use js::jsapi::JSContext;
 use js::jsval::JSVal;

servo/components/script/dom/document.rs

@@ -55,8 +55,8 @@ use dom::range::Range;
 use dom::treewalker::TreeWalker;
 use dom::uievent::UIEvent;
 use dom::window::{Window, WindowHelpers};
-use servo_util::namespace;
+use util::namespace;
-use servo_util::str::{DOMString, split_html_space_chars};
+use util::str::{DOMString, split_html_space_chars};
 
 use html5ever::tree_builder::{QuirksMode, NoQuirks, LimitedQuirks, Quirks};
 use layout_interface::{LayoutChan, Msg};

servo/components/script/dom/documentfragment.rs

@@ -15,7 +15,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlcollection::HTMLCollection;
 use dom::node::{Node, NodeHelpers, NodeTypeId, window_from_node};
 use dom::nodelist::NodeList;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct DocumentFragment {

servo/components/script/dom/documenttype.rs

@@ -9,7 +9,7 @@ use dom::bindings::js::{JSRef, Temporary};
 use dom::document::Document;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::node::{Node, NodeHelpers, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::borrow::ToOwned;
 

servo/components/script/dom/domexception.rs

@@ -9,7 +9,7 @@ use dom::bindings::error::Error;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::borrow::ToOwned;
 

servo/components/script/dom/domimplementation.rs

@@ -23,7 +23,7 @@ use dom::htmlhtmlelement::HTMLHtmlElement;
 use dom::htmltitleelement::HTMLTitleElement;
 use dom::node::Node;
 use dom::text::Text;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::borrow::ToOwned;
 

servo/components/script/dom/domparser.rs

@@ -15,7 +15,7 @@ use dom::document::{Document, DocumentHelpers, IsHTMLDocument};
 use dom::document::DocumentSource;
 use dom::window::Window;
 use parse::html::{HTMLInput, parse_html};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::borrow::ToOwned;
 

servo/components/script/dom/domrect.rs

@@ -8,7 +8,7 @@ use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::window::Window;
-use servo_util::geometry::Au;
+use util::geometry::Au;
 use std::num::Float;
 
 #[dom_struct]

servo/components/script/dom/domstringmap.rs

@@ -10,7 +10,7 @@ use dom::bindings::js::{JS, JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::node::window_from_node;
 use dom::htmlelement::{HTMLElement, HTMLElementCustomAttributeHelpers};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct DOMStringMap {

servo/components/script/dom/domtokenlist.rs

@@ -13,7 +13,7 @@ use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::element::{Element, AttributeHandlers};
 use dom::node::window_from_node;
 
-use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS};
+use util::str::{DOMString, HTML_SPACE_CHARACTERS};
 use string_cache::Atom;
 
 use std::borrow::ToOwned;

servo/components/script/dom/element.rs

@@ -52,8 +52,8 @@ use dom::virtualmethods::{VirtualMethods, vtable_for};
 use devtools_traits::AttrInfo;
 use style::{self, SimpleColorAttribute, UnsignedIntegerAttribute};
 use style::{IntegerAttribute, LengthAttribute, matches};
-use servo_util::namespace;
+use util::namespace;
-use servo_util::str::{DOMString, LengthOrPercentageOrAuto};
+use util::str::{DOMString, LengthOrPercentageOrAuto};
 
 use html5ever::tree_builder::{NoQuirks, LimitedQuirks, Quirks};
 

servo/components/script/dom/errorevent.rs

@@ -14,7 +14,7 @@ use dom::bindings::trace::JSTraceable;
 
 use dom::bindings::utils::reflect_dom_object;
 use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use dom::bindings::cell::DOMRefCell;
 use std::borrow::ToOwned;

servo/components/script/dom/event.rs

@@ -10,7 +10,7 @@ use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{MutNullableJS, JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::eventtarget::EventTarget;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::borrow::ToOwned;
 use std::cell::Cell;

servo/components/script/dom/eventtarget.rs

@@ -19,8 +19,8 @@ use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTargetTypeId;
 use dom::virtualmethods::VirtualMethods;
 use js::jsapi::{JS_CompileUCFunction, JS_GetFunctionObject, JS_CloneFunctionObject};
 use js::jsapi::{JSContext, JSObject};
-use servo_util::fnv::FnvHasher;
+use util::fnv::FnvHasher;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use libc::{c_char, size_t};
 use std::borrow::ToOwned;

servo/components/script/dom/file.rs

@@ -8,7 +8,7 @@ use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::reflect_dom_object;
 use dom::blob::{Blob, BlobTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct File {

servo/components/script/dom/formdata.rs

@@ -15,7 +15,7 @@ use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::blob::Blob;
 use dom::file::File;
 use dom::htmlformelement::HTMLFormElement;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::borrow::ToOwned;
 use std::collections::HashMap;

servo/components/script/dom/htmlanchorelement.rs

@@ -22,7 +22,7 @@ use dom::virtualmethods::VirtualMethods;
 
 use std::default::Default;
 use string_cache::Atom;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLAnchorElement {

servo/components/script/dom/htmlappletelement.rs

@@ -10,7 +10,7 @@ use dom::element::ElementTypeId;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLAppletElement {

servo/components/script/dom/htmlareaelement.rs

@@ -19,7 +19,7 @@ use dom::virtualmethods::VirtualMethods;
 
 use std::default::Default;
 use string_cache::Atom;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[jstraceable]
 #[must_root]

servo/components/script/dom/htmlaudioelement.rs

@@ -11,7 +11,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlelement::HTMLElementTypeId;
 use dom::htmlmediaelement::{HTMLMediaElement, HTMLMediaElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLAudioElement {

servo/components/script/dom/htmlbaseelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLBaseElement {

servo/components/script/dom/htmlbodyelement.rs

@@ -18,7 +18,7 @@ use dom::node::{Node, NodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 
 use cssparser::RGBA;
-use servo_util::str::{self, DOMString};
+use util::str::{self, DOMString};
 
 use std::borrow::ToOwned;
 use std::cell::Cell;

servo/components/script/dom/htmlbrelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLBRElement {

servo/components/script/dom/htmlbuttonelement.rs

@@ -20,7 +20,7 @@ use dom::virtualmethods::VirtualMethods;
 
 use std::ascii::OwnedAsciiExt;
 use std::borrow::ToOwned;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 use string_cache::Atom;
 
 #[dom_struct]

servo/components/script/dom/htmlcanvaselement.rs

@@ -20,7 +20,7 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::str::{DOMString, parse_unsigned_integer};
+use util::str::{DOMString, parse_unsigned_integer};
 
 use geom::size::Size2D;
 

servo/components/script/dom/htmlcollection.rs

@@ -12,8 +12,8 @@ use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::element::{Element, AttributeHandlers, ElementHelpers};
 use dom::node::{Node, NodeHelpers, TreeIterator};
 use dom::window::Window;
-use servo_util::namespace;
+use util::namespace;
-use servo_util::str::{DOMString, split_html_space_chars};
+use util::str::{DOMString, split_html_space_chars};
 
 use std::ascii::AsciiExt;
 use std::iter::{FilterMap, Skip};

servo/components/script/dom/htmldataelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLDataElement {

servo/components/script/dom/htmldatalistelement.rs

@@ -14,7 +14,7 @@ use dom::htmlcollection::{HTMLCollection, CollectionFilter};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId, window_from_node};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLDataListElement {

servo/components/script/dom/htmldirectoryelement.rs

@@ -10,7 +10,7 @@ use dom::element::ElementTypeId;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLDirectoryElement {

servo/components/script/dom/htmldivelement.rs

@@ -10,7 +10,7 @@ use dom::element::ElementTypeId;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLDivElement {

servo/components/script/dom/htmldlistelement.rs

@@ -10,7 +10,7 @@ use dom::element::ElementTypeId;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLDListElement {

servo/components/script/dom/htmlelement.rs

@@ -27,7 +27,7 @@ use dom::htmltablecellelement::HTMLTableCellElementTypeId;
 use dom::node::{Node, NodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use string_cache::Atom;
 

servo/components/script/dom/htmlembedelement.rs

@@ -10,7 +10,7 @@ use dom::element::ElementTypeId;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLEmbedElement {

servo/components/script/dom/htmlfieldsetelement.rs

@@ -19,7 +19,7 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId, window_from
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::str::{DOMString, StaticStringVec};
+use util::str::{DOMString, StaticStringVec};
 use string_cache::Atom;
 
 #[dom_struct]

servo/components/script/dom/htmlfontelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLFontElement {

servo/components/script/dom/htmlformelement.rs

@@ -23,7 +23,7 @@ use dom::htmltextareaelement::HTMLTextAreaElement;
 use dom::node::{Node, NodeHelpers, NodeTypeId, document_from_node, window_from_node};
 use hyper::method::Method;
 use servo_msg::constellation_msg::LoadData;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 use script_task::{ScriptChan, ScriptMsg};
 use std::ascii::OwnedAsciiExt;
 use url::UrlParser;

servo/components/script/dom/htmlframeelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLFrameElement {

servo/components/script/dom/htmlframesetelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLFrameSetElement {

servo/components/script/dom/htmlheadelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLHeadElement {

servo/components/script/dom/htmlheadingelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[jstraceable]
 pub enum HeadingLevel {

servo/components/script/dom/htmlhrelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLHRElement {

servo/components/script/dom/htmlhtmlelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLHtmlElement {

servo/components/script/dom/htmliframeelement.rs

@@ -25,7 +25,7 @@ use page::{IterablePage, Page};
 use servo_msg::constellation_msg::{PipelineId, SubpageId, ConstellationChan};
 use servo_msg::constellation_msg::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
 use servo_msg::constellation_msg::Msg as ConstellationMsg;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 use std::ascii::AsciiExt;
 use std::cell::Cell;

servo/components/script/dom/htmlimageelement.rs

@@ -18,8 +18,8 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId, NodeHelpers, NodeDamage, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use servo_net::image_cache_task;
-use servo_util::geometry::to_px;
+use util::geometry::to_px;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 use string_cache::Atom;
 
 use url::{Url, UrlParser};

servo/components/script/dom/htmlinputelement.rs

@@ -34,7 +34,7 @@ use textinput::TextInput;
 use textinput::KeyReaction::{TriggerDefaultAction, DispatchInput, Nothing};
 use textinput::Lines::Single;
 
-use servo_util::str::DOMString;
+use util::str::DOMString;
 use string_cache::Atom;
 
 use std::ascii::OwnedAsciiExt;

servo/components/script/dom/htmllabelelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLLabelElement {

servo/components/script/dom/htmllegendelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLLegendElement {

servo/components/script/dom/htmllielement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLLIElement {

servo/components/script/dom/htmllinkelement.rs

@@ -18,7 +18,7 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeHelpers, NodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use layout_interface::{LayoutChan, Msg};
-use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS};
+use util::str::{DOMString, HTML_SPACE_CHARACTERS};
 
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;

servo/components/script/dom/htmlmapelement.rs

@@ -10,7 +10,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId};
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLMapElement {

servo/components/script/dom/htmlmediaelement.rs

@@ -9,7 +9,7 @@ use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::NodeTypeId;
-use servo_util::str::DOMString;
+use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLMediaElement {