diff options
182 files changed, 294 insertions, 294 deletions
diff --git a/components/canvas/canvas_paint_task.rs b/components/canvas/canvas_paint_task.rs index 73941e03343..6552d9e606a 100644 --- a/components/canvas/canvas_paint_task.rs +++ b/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}; diff --git a/components/canvas/lib.rs b/components/canvas/lib.rs index 4992df4588f..1d2decb1690 100644 --- a/components/canvas/lib.rs +++ b/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; diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index ceee0b2f869..c427e4e4a6e 100644 --- a/components/compositing/compositor.rs +++ b/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 servo_util::memory::MemoryProfilerChan; -use servo_util::opts; -use servo_util::time::{TimeProfilerCategory, profile, TimeProfilerChan}; -use servo_util::{memory, time}; +use util::geometry::{PagePx, ScreenPx, ViewportPx}; +use util::memory::MemoryProfilerChan; +use util::opts; +use util::time::{TimeProfilerCategory, profile, TimeProfilerChan}; +use util::{memory, time}; use std::collections::HashMap; use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::path::Path; diff --git a/components/compositing/compositor_task.rs b/components/compositing/compositor_task.rs index 2fba8bfa0f6..7eaf56798a2 100644 --- a/components/compositing/compositor_task.rs +++ b/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 servo_util::geometry::PagePx; -use servo_util::memory::MemoryProfilerChan; -use servo_util::time::TimeProfilerChan; +use util::cursor::Cursor; +use util::geometry::PagePx; +use util::memory::MemoryProfilerChan; +use util::time::TimeProfilerChan; use std::sync::mpsc::{channel, Sender, Receiver}; use std::fmt::{Error, Formatter, Show}; use std::rc::Rc; diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index 981fde200ce..45324165d0d 100644 --- a/components/compositing/constellation.rs +++ b/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 servo_util::geometry::{PagePx, ViewportPx}; -use servo_util::opts; -use servo_util::task::spawn_named; -use servo_util::time::TimeProfilerChan; +use util::cursor::Cursor; +use util::geometry::{PagePx, ViewportPx}; +use util::opts; +use util::task::spawn_named; +use util::time::TimeProfilerChan; use std::borrow::ToOwned; use std::cell::{Cell, RefCell}; use std::collections::{HashMap, HashSet}; diff --git a/components/compositing/headless.rs b/components/compositing/headless.rs index 4fdfe094806..d374cb28e54 100644 --- a/components/compositing/headless.rs +++ b/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 servo_util::memory; -use servo_util::time::TimeProfilerChan; -use servo_util::time; +use util::memory::MemoryProfilerChan; +use util::memory; +use util::time::TimeProfilerChan; +use util::time; /// Starts the compositor, which listens for messages on the specified port. /// diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index ff9a0ebcf1a..e7233be450a 100644 --- a/components/compositing/lib.rs +++ b/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; diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index a1dd6b3c24b..9442b56099b 100644 --- a/components/compositing/pipeline.rs +++ b/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}; diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs index 50b0a0ae64a..0c5e6c00ed3 100644 --- a/components/compositing/windowing.rs +++ b/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 servo_util::geometry::ScreenPx; +use util::cursor::Cursor; +use util::geometry::ScreenPx; use std::fmt::{Error, Formatter, Show}; use std::rc::Rc; diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index f653dd289ce..15eb292e949 100644 --- a/components/devtools/lib.rs +++ b/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; diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 7f3aa43ac4b..a3534f58646 100644 --- a/components/devtools_traits/lib.rs +++ b/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}; diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 36dc2c6b1b8..c0495a2f479 100644 --- a/components/gfx/display_list/mod.rs +++ b/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 servo_util::dlist as servo_dlist; -use servo_util::geometry::{self, Au, MAX_RECT, ZERO_RECT}; -use servo_util::range::Range; -use servo_util::smallvec::{SmallVec, SmallVec8}; +use util::cursor::Cursor; +use util::dlist as servo_dlist; +use util::geometry::{self, Au, MAX_RECT, ZERO_RECT}; +use util::range::Range; +use util::smallvec::{SmallVec, SmallVec8}; use std::fmt; use std::slice::Iter; use std::sync::Arc; diff --git a/components/gfx/display_list/optimizer.rs b/components/gfx/display_list/optimizer.rs index 735cae422ba..485cc1816a6 100644 --- a/components/gfx/display_list/optimizer.rs +++ b/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. diff --git a/components/gfx/font.rs b/components/gfx/font.rs index 324e755f438..366deb5e589 100644 --- a/components/gfx/font.rs +++ b/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 servo_util::smallvec::{SmallVec, SmallVec8}; +use util::cache::HashCache; +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}; diff --git a/components/gfx/font_cache_task.rs b/components/gfx/font_cache_task.rs index ac7648e1821..6084f54c710 100644 --- a/components/gfx/font_cache_task.rs +++ b/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 servo_util::str::LowercaseString; +use util::task::spawn_named; +use util::str::LowercaseString; use style::Source; /// A list of font templates that make up a given font family. diff --git a/components/gfx/font_context.rs b/components/gfx/font_context.rs index e67027cf53c..1441d1d5359 100644 --- a/components/gfx/font_context.rs +++ b/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 servo_util::smallvec::{SmallVec, SmallVec8}; -use servo_util::geometry::Au; -use servo_util::arc_ptr_eq; +use util::cache::HashCache; +use util::smallvec::{SmallVec, SmallVec8}; +use util::geometry::Au; +use util::arc_ptr_eq; use std::borrow::ToOwned; use std::rc::Rc; diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 5f1eae371df..6557b4bed2d 100644 --- a/components/gfx/lib.rs +++ b/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; diff --git a/components/gfx/paint_context.rs b/components/gfx/paint_context.rs index 2a4925beb83..e20aacf1cf3 100644 --- a/components/gfx/paint_context.rs +++ b/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 servo_util::opts; -use servo_util::range::Range; +use util::geometry::{Au, MAX_RECT}; +use util::opts; +use util::range::Range; use std::default::Default; use std::f32; use std::mem; diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs index 21eff70f32f..3a8243af100 100644 --- a/components/gfx/paint_task.rs +++ b/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 servo_util::opts; -use servo_util::smallvec::SmallVec; -use servo_util::task::spawn_named_with_send_on_failure; -use servo_util::task_state; -use servo_util::time::{TimeProfilerChan, TimeProfilerCategory, profile}; +use util::geometry::{Au, ZERO_POINT}; +use util::opts; +use util::smallvec::SmallVec; +use util::task::spawn_named_with_send_on_failure; +use util::task_state; +use util::time::{TimeProfilerChan, TimeProfilerCategory, profile}; use std::mem; use std::thread::Builder; use std::sync::Arc; diff --git a/components/gfx/platform/freetype/font.rs b/components/gfx/platform/freetype/font.rs index 3a5d61ef373..2ee09e8673b 100644 --- a/components/gfx/platform/freetype/font.rs +++ b/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 servo_util::geometry; -use servo_util::str::c_str_to_string; +use util::geometry::Au; +use util::geometry; +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}; diff --git a/components/gfx/platform/freetype/font_list.rs b/components/gfx/platform/freetype/font_list.rs index fbe354556c4..1b835339e31 100644 --- a/components/gfx/platform/freetype/font_list.rs +++ b/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}; diff --git a/components/gfx/platform/macos/font.rs b/components/gfx/platform/macos/font.rs index fb7f12782c0..7b22c69c105 100644 --- a/components/gfx/platform/macos/font.rs +++ b/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 servo_util::geometry; +use util::geometry::{Au, px_to_pt}; +use util::geometry; use platform::macos::font_context::FontContextHandle; use text::glyph::GlyphId; use style::computed_values::{font_stretch, font_weight}; diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs index be4b2d3c4d4..39aab3c068d 100644 --- a/components/gfx/text/glyph.rs +++ b/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 servo_util::range; -use servo_util::range::{Range, RangeIndex, EachIndex}; -use servo_util::geometry::Au; +use util::vec::*; +use util::range; +use util::range::{Range, RangeIndex, EachIndex}; +use util::geometry::Au; use std::cmp::{Ordering, PartialOrd}; use std::iter::repeat; diff --git a/components/gfx/text/shaping/harfbuzz.rs b/components/gfx/text/shaping/harfbuzz.rs index 98b287ba086..cd99abf89b0 100644 --- a/components/gfx/text/shaping/harfbuzz.rs +++ b/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 servo_util::range::Range; +use util::geometry::Au; +use util::range::Range; use std::char; use std::iter::repeat; use std::mem; diff --git a/components/gfx/text/text_run.rs b/components/gfx/text/text_run.rs index f98d47fe547..b2b0d4661c9 100644 --- a/components/gfx/text/text_run.rs +++ b/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 servo_util::range::Range; -use servo_util::vec::{Comparator, FullBinarySearchMethods}; +use util::geometry::Au; +use util::range::Range; +use util::vec::{Comparator, FullBinarySearchMethods}; use std::cmp::Ordering; use std::slice::Iter; use std::sync::Arc; diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs index fd3ecd541f9..2302cef36b8 100644 --- a/components/layout_traits/lib.rs +++ b/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}; diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 658fb6a4e71..7f0ece10414 100644 --- a/components/msg/constellation_msg.rs +++ b/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 servo_util::geometry::{PagePx, ViewportPx}; +use util::cursor::Cursor; +use util::geometry::{PagePx, ViewportPx}; use std::sync::mpsc::{channel, Sender, Receiver}; use url::Url; diff --git a/components/msg/lib.rs b/components/msg/lib.rs index b22627fb4fd..ad3b9e6b72f 100644 --- a/components/msg/lib.rs +++ b/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")] diff --git a/components/net/about_loader.rs b/components/net/about_loader.rs index bc87727c768..c5766dad14a 100644 --- a/components/net/about_loader.rs +++ b/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; diff --git a/components/net/file_loader.rs b/components/net/file_loader.rs index a2233ff54b8..6f388d3ea69 100644 --- a/components/net/file_loader.rs +++ b/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; diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 5f0877cdaa1..c5ef9e29899 100644 --- a/components/net/http_loader.rs +++ b/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; diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs index 6bc4875f39a..531f9f33600 100644 --- a/components/net/image_cache_task.rs +++ b/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 servo_util::taskpool::TaskPool; +use util::task::spawn_named; +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; diff --git a/components/net/lib.rs b/components/net/lib.rs index 857461aa335..c3c6047d0df 100644 --- a/components/net/lib.rs +++ b/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; diff --git a/components/net/local_image_cache.rs b/components/net/local_image_cache.rs index 8e8fa8da1df..35e8217e13e 100644 --- a/components/net/local_image_cache.rs +++ b/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> { diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs index 3093df5e56a..87532876e8d 100644 --- a/components/net/resource_task.rs +++ b/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; diff --git a/components/net/storage_task.rs b/components/net/storage_task.rs index ac65fa65bc0..d7e7ec69c77 100644 --- a/components/net/storage_task.rs +++ b/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 servo_util::task::spawn_named; +use util::str::DOMString; +use util::task::spawn_named; /// Request operations on the storage data associated with a particular url pub enum StorageTaskMsg { diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index e8a66199db7..53972dc6ab8 100644 --- a/components/script/dom/attr.rs +++ b/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}; diff --git a/components/script/dom/bindings/cell.rs b/components/script/dom/bindings/cell.rs index e064bf25bea..41ebf76f426 100644 --- a/components/script/dom/bindings/cell.rs +++ b/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 servo_util::task_state::{SCRIPT, IN_GC}; +use util::task_state; +use util::task_state::{SCRIPT, IN_GC}; use std::cell::{RefCell, Ref, RefMut}; diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 47dd912d700..63e58f2c03c 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/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', diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index 13efe243929..2258566499e 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/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}; diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs index f4c76dd4b07..1eef7548bb7 100644 --- a/components/script/dom/bindings/js.rs +++ b/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; diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 1d19d5d8c41..d2af1ebe968 100644 --- a/components/script/dom/bindings/trace.rs +++ b/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 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; diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index 69d75231fe8..e76ab04d92b 100644 --- a/components/script/dom/blob.rs +++ b/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; diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index bdc56530e7d..0ea9ef1e0cd 100644 --- a/components/script/dom/characterdata.rs +++ b/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; diff --git a/components/script/dom/comment.rs b/components/script/dom/comment.rs index 8d81c47f978..85cca18b2b2 100644 --- a/components/script/dom/comment.rs +++ b/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] diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 924a2bb1cbe..70323c510d9 100644 --- a/components/script/dom/console.rs +++ b/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 { diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 8bbbdc9c832..3ed92004dc8 100644 --- a/components/script/dom/create.rs +++ b/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; diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 81dd6aeeebe..49a6bfbeae3 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/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; diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs index b4247d99a03..ab8d53e5309 100644 --- a/components/script/dom/customevent.rs +++ b/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 { diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 22b7befd87c..73ca81cb18a 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/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 servo_util::task_state; -use servo_util::task_state::{SCRIPT, IN_WORKER}; +use util::task::spawn_named; +use util::task_state; +use util::task_state::{SCRIPT, IN_WORKER}; use js::jsapi::JSContext; use js::jsval::JSVal; diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index d7e9ce0daa2..d2775d3e5aa 100644 --- a/components/script/dom/document.rs +++ b/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 servo_util::str::{DOMString, split_html_space_chars}; +use util::namespace; +use util::str::{DOMString, split_html_space_chars}; use html5ever::tree_builder::{QuirksMode, NoQuirks, LimitedQuirks, Quirks}; use layout_interface::{LayoutChan, Msg}; diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index 21ca9030dc3..f8e76103d7d 100644 --- a/components/script/dom/documentfragment.rs +++ b/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 { diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs index fc9407c5dd0..a2deb8ecf5b 100644 --- a/components/script/dom/documenttype.rs +++ b/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; diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs index 48f8e4b52f6..98a17d50d51 100644 --- a/components/script/dom/domexception.rs +++ b/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; diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index 285b86967e8..09b1582fd40 100644 --- a/components/script/dom/domimplementation.rs +++ b/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; diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index a3a7db0b1ca..5fe79f5156c 100644 --- a/components/script/dom/domparser.rs +++ b/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; diff --git a/components/script/dom/domrect.rs b/components/script/dom/domrect.rs index 737ea69ed5f..513e96ef28d 100644 --- a/components/script/dom/domrect.rs +++ b/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] diff --git a/components/script/dom/domstringmap.rs b/components/script/dom/domstringmap.rs index 6b2b4fafffb..72d9797ca4d 100644 --- a/components/script/dom/domstringmap.rs +++ b/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 { diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index 0ab2a40b81e..59a7f0d3e0a 100644 --- a/components/script/dom/domtokenlist.rs +++ b/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; diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index f0ab72b430a..540916c027e 100644 --- a/components/script/dom/element.rs +++ b/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 servo_util::str::{DOMString, LengthOrPercentageOrAuto}; +use util::namespace; +use util::str::{DOMString, LengthOrPercentageOrAuto}; use html5ever::tree_builder::{NoQuirks, LimitedQuirks, Quirks}; diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs index 2ae0eec9a18..d16df30c7d5 100644 --- a/components/script/dom/errorevent.rs +++ b/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; diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index e2fe8c25609..0cb8dbb6a29 100644 --- a/components/script/dom/event.rs +++ b/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; diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 6a08c4d1d60..b2c8ca5187f 100644 --- a/components/script/dom/eventtarget.rs +++ b/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 servo_util::str::DOMString; +use util::fnv::FnvHasher; +use util::str::DOMString; use libc::{c_char, size_t}; use std::borrow::ToOwned; diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index 482b0aa9478..a592d336fb0 100644 --- a/components/script/dom/file.rs +++ b/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 { diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index 452832560f9..49871cde80e 100644 --- a/components/script/dom/formdata.rs +++ b/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; diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index dd1f8376ec2..775db1e2852 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/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 { diff --git a/components/script/dom/htmlappletelement.rs b/components/script/dom/htmlappletelement.rs index 26dc1419081..4ef0bc6cd2e 100644 --- a/components/script/dom/htmlappletelement.rs +++ b/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 { diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs index 82e5ad86d15..85ccb270cca 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/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] diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs index 36419faf54e..eff07c1c7cf 100644 --- a/components/script/dom/htmlaudioelement.rs +++ b/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 { diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs index 9547188eb96..76745d1d1c8 100644 --- a/components/script/dom/htmlbaseelement.rs +++ b/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 { diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index a6bd56bc85d..06a9456913c 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/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; diff --git a/components/script/dom/htmlbrelement.rs b/components/script/dom/htmlbrelement.rs index ea6d3eeecc6..db8eeeb5924 100644 --- a/components/script/dom/htmlbrelement.rs +++ b/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 { diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index bb91d93ca00..04c827056b7 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/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] diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index cad7c4c7a33..a9606caf923 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/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; diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index a1aa197046e..243c51e3b90 100644 --- a/components/script/dom/htmlcollection.rs +++ b/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 servo_util::str::{DOMString, split_html_space_chars}; +use util::namespace; +use util::str::{DOMString, split_html_space_chars}; use std::ascii::AsciiExt; use std::iter::{FilterMap, Skip}; diff --git a/components/script/dom/htmldataelement.rs b/components/script/dom/htmldataelement.rs index 724cb88d5b3..fa455dc772c 100644 --- a/components/script/dom/htmldataelement.rs +++ b/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 { diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs index 6688fb6662f..669f9c9d84f 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/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 { diff --git a/components/script/dom/htmldirectoryelement.rs b/components/script/dom/htmldirectoryelement.rs index 2e2ca2ee37e..10691999e21 100644 --- a/components/script/dom/htmldirectoryelement.rs +++ b/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 { diff --git a/components/script/dom/htmldivelement.rs b/components/script/dom/htmldivelement.rs index 77ee6caaa39..653ad2aa0a8 100644 --- a/components/script/dom/htmldivelement.rs +++ b/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 { diff --git a/components/script/dom/htmldlistelement.rs b/components/script/dom/htmldlistelement.rs index 60364ec0cd8..41e5ea94f9c 100644 --- a/components/script/dom/htmldlistelement.rs +++ b/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 { diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 337490dc987..c5a8249fc14 100644 --- a/components/script/dom/htmlelement.rs +++ b/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; diff --git a/components/script/dom/htmlembedelement.rs b/components/script/dom/htmlembedelement.rs index 88db19a8c95..f3779f9c33c 100644 --- a/components/script/dom/htmlembedelement.rs +++ b/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 { diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index 7befe8426d0..010ee655c22 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/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] diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index d26f56e689f..2df515cbc83 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/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 { diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 48edae7059f..2bc35264f64 100644 --- a/components/script/dom/htmlformelement.rs +++ b/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; diff --git a/components/script/dom/htmlframeelement.rs b/components/script/dom/htmlframeelement.rs index 93194bfde58..565c2e9a7a9 100644 --- a/components/script/dom/htmlframeelement.rs +++ b/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 { diff --git a/components/script/dom/htmlframesetelement.rs b/components/script/dom/htmlframesetelement.rs index a3503bb5098..060f4a63018 100644 --- a/components/script/dom/htmlframesetelement.rs +++ b/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 { diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs index e77531f63b3..5b38078e34c 100644 --- a/components/script/dom/htmlheadelement.rs +++ b/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 { diff --git a/components/script/dom/htmlheadingelement.rs b/components/script/dom/htmlheadingelement.rs index 7ad4acbfdb8..2cd4dd3af30 100644 --- a/components/script/dom/htmlheadingelement.rs +++ b/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 { diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/htmlhrelement.rs index fe20c3311d3..302dcafcf2b 100644 --- a/components/script/dom/htmlhrelement.rs +++ b/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 { diff --git a/components/script/dom/htmlhtmlelement.rs b/components/script/dom/htmlhtmlelement.rs index 36230ad663e..f9e98199430 100644 --- a/components/script/dom/htmlhtmlelement.rs +++ b/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 { diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 78afe6e0b14..1f1751f9506 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/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; diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 2be787eabef..c555e5c50e4 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/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 servo_util::str::DOMString; +use util::geometry::to_px; +use util::str::DOMString; use string_cache::Atom; use url::{Url, UrlParser}; diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index b8af0ea9d36..0a5624b77ea 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/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; diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs index 4d69b2a8a32..a6db0ada537 100644 --- a/components/script/dom/htmllabelelement.rs +++ b/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 { diff --git a/components/script/dom/htmllegendelement.rs b/components/script/dom/htmllegendelement.rs index feb43b5bbc2..38c3a154400 100644 --- a/components/script/dom/htmllegendelement.rs +++ b/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 { diff --git a/components/script/dom/htmllielement.rs b/components/script/dom/htmllielement.rs index 3989cacf27b..09d60655ac7 100644 --- a/components/script/dom/htmllielement.rs +++ b/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 { diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 3cf8601bd04..6b5cdc8f20d 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/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; diff --git a/components/script/dom/htmlmapelement.rs b/components/script/dom/htmlmapelement.rs index ab840e71106..be58a71738d 100644 --- a/components/script/dom/htmlmapelement.rs +++ b/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 { diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index ef75b1f43ee..0105d08d226 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/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 { diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 3d5e0fe18f0..730e1267d7b 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.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 HTMLMetaElement { diff --git a/components/script/dom/htmlmeterelement.rs b/components/script/dom/htmlmeterelement.rs index 0905b111b90..d700f0342cb 100644 --- a/components/script/dom/htmlmeterelement.rs +++ b/components/script/dom/htmlmeterelement.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 HTMLMeterElement { diff --git a/components/script/dom/htmlmodelement.rs b/components/script/dom/htmlmodelement.rs index faa963c8444..9c329089a85 100644 --- a/components/script/dom/htmlmodelement.rs +++ b/components/script/dom/htmlmodelement.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 HTMLModElement { diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index 1d4160a8a38..2a8c0c19818 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -22,7 +22,7 @@ use dom::virtualmethods::VirtualMethods; use servo_net::image_cache_task; use servo_net::image_cache_task::ImageCacheTask; -use servo_util::str::DOMString; +use util::str::DOMString; use string_cache::Atom; use url::Url; diff --git a/components/script/dom/htmlolistelement.rs b/components/script/dom/htmlolistelement.rs index 0f274b25668..a8554f20013 100644 --- a/components/script/dom/htmlolistelement.rs +++ b/components/script/dom/htmlolistelement.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 HTMLOListElement { diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index d9d0e0cd2c4..50ce7aa36e3 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -17,7 +17,7 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId}; use dom::virtualmethods::VirtualMethods; -use servo_util::str::DOMString; +use util::str::DOMString; use string_cache::Atom; #[dom_struct] diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index f80f3b63c49..def3d358e8d 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -21,7 +21,7 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId}; use dom::virtualmethods::VirtualMethods; -use servo_util::str::{DOMString, split_html_space_chars}; +use util::str::{DOMString, split_html_space_chars}; use string_cache::Atom; #[dom_struct] diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs index 66e6e958ed8..940a89dc043 100644 --- a/components/script/dom/htmloutputelement.rs +++ b/components/script/dom/htmloutputelement.rs @@ -12,7 +12,7 @@ use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId, window_from_node}; use dom::validitystate::ValidityState; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct HTMLOutputElement { diff --git a/components/script/dom/htmlparagraphelement.rs b/components/script/dom/htmlparagraphelement.rs index baa4ef05623..9619659d9bd 100644 --- a/components/script/dom/htmlparagraphelement.rs +++ b/components/script/dom/htmlparagraphelement.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 HTMLParagraphElement { diff --git a/components/script/dom/htmlparamelement.rs b/components/script/dom/htmlparamelement.rs index 888c5b0d28a..8b526dd70ff 100644 --- a/components/script/dom/htmlparamelement.rs +++ b/components/script/dom/htmlparamelement.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 HTMLParamElement { diff --git a/components/script/dom/htmlpreelement.rs b/components/script/dom/htmlpreelement.rs index 5ab72d27d2b..07da87f10a7 100644 --- a/components/script/dom/htmlpreelement.rs +++ b/components/script/dom/htmlpreelement.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 HTMLPreElement { diff --git a/components/script/dom/htmlprogresselement.rs b/components/script/dom/htmlprogresselement.rs index 07df018384e..a75457f20f4 100644 --- a/components/script/dom/htmlprogresselement.rs +++ b/components/script/dom/htmlprogresselement.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 HTMLProgressElement { diff --git a/components/script/dom/htmlquoteelement.rs b/components/script/dom/htmlquoteelement.rs index bd14ded1f49..7cbbfdb0060 100644 --- a/components/script/dom/htmlquoteelement.rs +++ b/components/script/dom/htmlquoteelement.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 HTMLQuoteElement { diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index f9f52d3f7c9..c1f933e362b 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -30,7 +30,7 @@ use script_task::{ScriptMsg, Runnable}; use encoding::all::UTF_8; use encoding::types::{Encoding, DecoderTrap}; use servo_net::resource_task::load_whole_resource; -use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec}; +use util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec}; use std::borrow::ToOwned; use std::cell::Cell; use string_cache::Atom; diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 4f82d2e91f8..7d64a28d1ea 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -20,7 +20,7 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId, window_from use dom::validitystate::ValidityState; use dom::virtualmethods::VirtualMethods; -use servo_util::str::DOMString; +use util::str::DOMString; use string_cache::Atom; use std::borrow::ToOwned; diff --git a/components/script/dom/htmlsourceelement.rs b/components/script/dom/htmlsourceelement.rs index 4f125312f10..b35c1264166 100644 --- a/components/script/dom/htmlsourceelement.rs +++ b/components/script/dom/htmlsourceelement.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 HTMLSourceElement { diff --git a/components/script/dom/htmlspanelement.rs b/components/script/dom/htmlspanelement.rs index 8eb656542d9..bf7e1fccdc8 100644 --- a/components/script/dom/htmlspanelement.rs +++ b/components/script/dom/htmlspanelement.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 HTMLSpanElement { diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index 8471280be07..5769ed56142 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -13,7 +13,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; +use util::str::DOMString; use style::{StylesheetOrigin, Stylesheet}; #[dom_struct] diff --git a/components/script/dom/htmltablecaptionelement.rs b/components/script/dom/htmltablecaptionelement.rs index 4e390f94ca6..453fae62851 100644 --- a/components/script/dom/htmltablecaptionelement.rs +++ b/components/script/dom/htmltablecaptionelement.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 HTMLTableCaptionElement { diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs index d19a342b5ae..e847ba6afd0 100644 --- a/components/script/dom/htmltablecellelement.rs +++ b/components/script/dom/htmltablecellelement.rs @@ -13,7 +13,7 @@ use dom::node::NodeTypeId; use dom::virtualmethods::VirtualMethods; use cssparser::RGBA; -use servo_util::str::{self, DOMString, LengthOrPercentageOrAuto}; +use util::str::{self, DOMString, LengthOrPercentageOrAuto}; use std::cell::Cell; #[derive(Copy, PartialEq, Show)] diff --git a/components/script/dom/htmltablecolelement.rs b/components/script/dom/htmltablecolelement.rs index 48a9bd95477..41770af9db9 100644 --- a/components/script/dom/htmltablecolelement.rs +++ b/components/script/dom/htmltablecolelement.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 HTMLTableColElement { diff --git a/components/script/dom/htmltabledatacellelement.rs b/components/script/dom/htmltabledatacellelement.rs index 0551745a37d..91ae686d766 100644 --- a/components/script/dom/htmltabledatacellelement.rs +++ b/components/script/dom/htmltabledatacellelement.rs @@ -11,7 +11,7 @@ use dom::element::ElementTypeId; use dom::htmlelement::HTMLElementTypeId; use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementTypeId}; use dom::node::{Node, NodeTypeId}; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct HTMLTableDataCellElement { diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index f78ece6de15..0784e9b178d 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -18,7 +18,7 @@ use dom::node::{Node, NodeHelpers, NodeTypeId}; use dom::virtualmethods::VirtualMethods; use cssparser::RGBA; -use servo_util::str::{self, DOMString, LengthOrPercentageOrAuto}; +use util::str::{self, DOMString, LengthOrPercentageOrAuto}; use std::cell::Cell; #[dom_struct] diff --git a/components/script/dom/htmltableheadercellelement.rs b/components/script/dom/htmltableheadercellelement.rs index 41a2a129512..b3d94bb0017 100644 --- a/components/script/dom/htmltableheadercellelement.rs +++ b/components/script/dom/htmltableheadercellelement.rs @@ -11,7 +11,7 @@ use dom::htmlelement::HTMLElementTypeId; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementTypeId}; use dom::node::{Node, NodeTypeId}; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct HTMLTableHeaderCellElement { diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs index ffda70c187e..f4dc27c2b01 100644 --- a/components/script/dom/htmltablerowelement.rs +++ b/components/script/dom/htmltablerowelement.rs @@ -14,7 +14,7 @@ use dom::node::{Node, NodeTypeId}; use dom::virtualmethods::VirtualMethods; use cssparser::RGBA; -use servo_util::str::{self, DOMString}; +use util::str::{self, DOMString}; use std::cell::Cell; #[dom_struct] diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs index c3fcf254db3..9e4c8111e5f 100644 --- a/components/script/dom/htmltablesectionelement.rs +++ b/components/script/dom/htmltablesectionelement.rs @@ -14,7 +14,7 @@ use dom::node::{Node, NodeTypeId}; use dom::virtualmethods::VirtualMethods; use cssparser::RGBA; -use servo_util::str::{self, DOMString}; +use util::str::{self, DOMString}; use std::cell::Cell; #[dom_struct] diff --git a/components/script/dom/htmltemplateelement.rs b/components/script/dom/htmltemplateelement.rs index 285d4045f1e..92028db1bcf 100644 --- a/components/script/dom/htmltemplateelement.rs +++ b/components/script/dom/htmltemplateelement.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 HTMLTemplateElement { diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 5582e6aa293..ed6a8c8f06a 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -26,7 +26,7 @@ use dom::node::{document_from_node}; use textinput::{TextInput, Lines, KeyReaction}; use dom::virtualmethods::VirtualMethods; -use servo_util::str::DOMString; +use util::str::DOMString; use string_cache::Atom; use std::borrow::ToOwned; diff --git a/components/script/dom/htmltimeelement.rs b/components/script/dom/htmltimeelement.rs index 09f8246b3cc..70abbbb2759 100644 --- a/components/script/dom/htmltimeelement.rs +++ b/components/script/dom/htmltimeelement.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 HTMLTimeElement { diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs index 2d3f9ef71aa..9696e9ae7c0 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/htmltitleelement.rs @@ -15,7 +15,7 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeHelpers, NodeTypeId}; use dom::text::Text; use dom::virtualmethods::VirtualMethods; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct HTMLTitleElement { diff --git a/components/script/dom/htmltrackelement.rs b/components/script/dom/htmltrackelement.rs index 474da844cbc..31e9f4a2a62 100644 --- a/components/script/dom/htmltrackelement.rs +++ b/components/script/dom/htmltrackelement.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 HTMLTrackElement { diff --git a/components/script/dom/htmlulistelement.rs b/components/script/dom/htmlulistelement.rs index a197a41feb4..7e67c3442b1 100644 --- a/components/script/dom/htmlulistelement.rs +++ b/components/script/dom/htmlulistelement.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 HTMLUListElement { diff --git a/components/script/dom/htmlunknownelement.rs b/components/script/dom/htmlunknownelement.rs index 4d9bbc01ffb..4b470adb82c 100644 --- a/components/script/dom/htmlunknownelement.rs +++ b/components/script/dom/htmlunknownelement.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 HTMLUnknownElement { diff --git a/components/script/dom/htmlvideoelement.rs b/components/script/dom/htmlvideoelement.rs index 5bda0fdbf08..06817d89198 100644 --- a/components/script/dom/htmlvideoelement.rs +++ b/components/script/dom/htmlvideoelement.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 HTMLVideoElement { diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index 518543c27ed..7cd1c4b9e98 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -14,7 +14,7 @@ use dom::event::{Event, EventTypeId}; use dom::uievent::UIEvent; use dom::window::Window; use servo_msg::constellation_msg; -use servo_util::str::DOMString; +use util::str::DOMString; use std::borrow::ToOwned; use std::cell::{RefCell, Cell}; diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs index 58e95ecba2c..b9f1867e923 100644 --- a/components/script/dom/location.rs +++ b/components/script/dom/location.rs @@ -11,7 +11,7 @@ use dom::urlhelper::UrlHelper; use dom::window::Window; use page::Page; -use servo_util::str::DOMString; +use util::str::DOMString; use std::rc::Rc; diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index 7cae6302073..b474efb7385 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -13,7 +13,7 @@ use dom::bindings::utils::reflect_dom_object; use dom::event::{Event, EventTypeId}; use dom::eventtarget::{EventTarget, EventTargetHelpers}; -use servo_util::str::DOMString; +use util::str::DOMString; use js::jsapi::JSContext; use js::jsval::{JSVal, UndefinedValue}; diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index 11a45bbc208..04403a948b6 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -14,7 +14,7 @@ use dom::event::{Event, EventTypeId}; use dom::eventtarget::EventTarget; use dom::uievent::UIEvent; use dom::window::Window; -use servo_util::str::DOMString; +use util::str::DOMString; use std::cell::Cell; use std::default::Default; diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index 7ecee34f456..257e1d2dfab 100644 --- a/components/script/dom/navigator.rs +++ b/components/script/dom/navigator.rs @@ -9,7 +9,7 @@ use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::navigatorinfo; use dom::window::Window; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct Navigator { diff --git a/components/script/dom/navigatorinfo.rs b/components/script/dom/navigatorinfo.rs index b8fabd01acf..7dc94d85374 100644 --- a/components/script/dom/navigatorinfo.rs +++ b/components/script/dom/navigatorinfo.rs @@ -2,8 +2,8 @@ * 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::str::DOMString; -use servo_util::opts; +use util::str::DOMString; +use util::opts; use std::borrow::ToOwned; diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index b780a3923e2..bd262ae2aaa 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -46,8 +46,8 @@ use geom::rect::Rect; use layout_interface::{LayoutChan, Msg}; use devtools_traits::NodeInfo; use script_traits::UntrustedNodeAddress; -use servo_util::geometry::Au; -use servo_util::str::{DOMString, null_str_as_empty}; +use util::geometry::Au; +use util::str::{DOMString, null_str_as_empty}; use style::{matches, SelectorList}; use js::jsapi::{JSContext, JSObject, JSTracer, JSRuntime}; diff --git a/components/script/dom/processinginstruction.rs b/components/script/dom/processinginstruction.rs index 23b37f2d436..528c4cdd64a 100644 --- a/components/script/dom/processinginstruction.rs +++ b/components/script/dom/processinginstruction.rs @@ -10,7 +10,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 processing instruction node. #[dom_struct] diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs index 9c2f64385bb..57b46733982 100644 --- a/components/script/dom/progressevent.rs +++ b/components/script/dom/progressevent.rs @@ -11,7 +11,7 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::reflect_dom_object; use dom::event::{Event, EventTypeId}; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct ProgressEvent { diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs index 7c7b2bec69d..e4fbb863ead 100644 --- a/components/script/dom/servohtmlparser.rs +++ b/components/script/dom/servohtmlparser.rs @@ -15,7 +15,7 @@ use dom::node::TrustedNodeAddress; use dom::document::{Document, DocumentHelpers}; use parse::Parser; -use servo_util::task_state; +use util::task_state; use std::default::Default; use url::Url; diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index 01fce8d2d82..15eee81f2c5 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -8,7 +8,7 @@ use dom::bindings::global::{GlobalRef, GlobalField}; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::bindings::error::Fallible; -use servo_util::str::DOMString; +use util::str::DOMString; use servo_net::storage_task::StorageTask; use servo_net::storage_task::StorageTaskMsg; use std::sync::mpsc::channel; diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index 2d0b58ec923..2166164babe 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -17,7 +17,7 @@ use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::str::ByteString; use dom::bindings::utils::{Reflector, Reflectable}; use dom::blob::Blob; -use servo_util::str::DOMString; +use util::str::DOMString; use js::jsapi::{JSContext, JSObject}; use js::jsval::{JSVal, NullValue}; diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs index e2936626b9d..ea6c2791e96 100644 --- a/components/script/dom/text.rs +++ b/components/script/dom/text.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 text node. #[dom_struct] diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index 33c539dd150..c7ab774a2a2 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -13,7 +13,7 @@ use dom::bindings::js::{MutNullableJS, JSRef, RootedReference, Temporary}; use dom::bindings::utils::reflect_dom_object; use dom::event::{Event, EventTypeId}; use dom::window::Window; -use servo_util::str::DOMString; +use util::str::DOMString; use std::cell::Cell; use std::default::Default; diff --git a/components/script/dom/urlhelper.rs b/components/script/dom/urlhelper.rs index 290fede857c..66eec322176 100644 --- a/components/script/dom/urlhelper.rs +++ b/components/script/dom/urlhelper.rs @@ -2,7 +2,7 @@ * 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::str::DOMString; +use util::str::DOMString; use url::Url; use std::borrow::ToOwned; diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs index b8ab6c9329c..e2a46b3e866 100644 --- a/components/script/dom/urlsearchparams.rs +++ b/components/script/dom/urlsearchparams.rs @@ -12,7 +12,7 @@ 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 encoding::all::UTF_8; use encoding::types::{EncodingRef, EncoderTrap}; diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs index 1bd86677bd6..707298ebdc5 100644 --- a/components/script/dom/virtualmethods.rs +++ b/components/script/dom/virtualmethods.rs @@ -57,7 +57,7 @@ use dom::htmltextareaelement::HTMLTextAreaElement; use dom::htmltitleelement::HTMLTitleElement; use dom::node::{Node, NodeHelpers, NodeTypeId, CloneChildrenFlag}; -use servo_util::str::DOMString; +use util::str::DOMString; use string_cache::Atom; diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index f01e7946ecf..da09b6bb767 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -9,7 +9,7 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{Temporary, JSRef}; use dom::bindings::utils::reflect_dom_object; use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct WebSocket { diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index fe7ea336122..5477f7a3d65 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -34,7 +34,7 @@ use servo_msg::compositor_msg::ScriptListener; use servo_msg::constellation_msg::LoadData; use servo_net::image_cache_task::ImageCacheTask; use servo_net::storage_task::StorageTask; -use servo_util::str::{DOMString,HTML_SPACE_CHARACTERS}; +use util::str::{DOMString,HTML_SPACE_CHARACTERS}; use js::jsapi::JS_EvaluateUCScript; use js::jsapi::JSContext; diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index df793ede178..2f52f0576d1 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -19,7 +19,7 @@ use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; use dom::messageevent::MessageEvent; use script_task::{ScriptChan, ScriptMsg, Runnable}; -use servo_util::str::DOMString; +use util::str::DOMString; use js::jsapi::JSContext; use js::jsval::JSVal; diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index e78a4a71ed0..24dd5c2b0f5 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -20,7 +20,7 @@ use script_task::{ScriptChan, TimerSource}; use timers::{IsInterval, TimerId, TimerManager, TimerCallback}; use servo_net::resource_task::{ResourceTask, load_whole_resource}; -use servo_util::str::DOMString; +use util::str::DOMString; use js::jsapi::JSContext; use js::jsval::JSVal; diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs index 5193d50495a..787552c84a0 100644 --- a/components/script/dom/workerlocation.rs +++ b/components/script/dom/workerlocation.rs @@ -10,7 +10,7 @@ use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::urlhelper::UrlHelper; use dom::workerglobalscope::WorkerGlobalScope; -use servo_util::str::DOMString; +use util::str::DOMString; use url::Url; diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs index 81455a1dd63..203e2bd03fa 100644 --- a/components/script/dom/workernavigator.rs +++ b/components/script/dom/workernavigator.rs @@ -9,7 +9,7 @@ use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::navigatorinfo; use dom::workerglobalscope::WorkerGlobalScope; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct WorkerNavigator { diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 62a42ec3cf6..0f6e9551272 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -47,8 +47,8 @@ use net::resource_task::{ResourceTask, ResourceCORSData, LoadData, LoadResponse} use net::resource_task::ControlMsg::Load; use net::resource_task::ProgressMsg::{Payload, Done}; use cors::{allow_cross_origin_request, CORSRequest, RequestMode}; -use servo_util::str::DOMString; -use servo_util::task::spawn_named; +use util::str::DOMString; +use util::task::spawn_named; use std::ascii::AsciiExt; use std::borrow::ToOwned; diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index 80181c09cda..e4c6231b649 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -12,7 +12,7 @@ use geom::point::Point2D; use geom::rect::Rect; use script_traits::{ScriptControlChan, OpaqueScriptLayoutChannel, UntrustedNodeAddress}; use servo_msg::constellation_msg::{PipelineExitType, WindowSizeData}; -use servo_util::geometry::Au; +use util::geometry::Au; use std::any::Any; use std::sync::mpsc::{channel, Receiver, Sender}; use std::boxed::BoxAny; diff --git a/components/script/lib.rs b/components/script/lib.rs index 055d658ddee..17a05dac3fb 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -36,7 +36,7 @@ extern crate script_traits; #[no_link] #[plugin] #[macro_use] extern crate "plugins" as servo_plugins; extern crate "net" as servo_net; -extern crate "util" as servo_util; +extern crate util; #[macro_use] extern crate style; extern crate "msg" as servo_msg; diff --git a/components/script/page.rs b/components/script/page.rs index b051e1df891..2433f03f2c5 100644 --- a/components/script/page.rs +++ b/components/script/page.rs @@ -26,10 +26,10 @@ use servo_msg::constellation_msg::{ConstellationChan, WindowSizeData}; use servo_msg::constellation_msg::{PipelineId, SubpageId}; use servo_net::resource_task::ResourceTask; use servo_net::storage_task::StorageTask; -use servo_util::geometry::{Au, MAX_RECT}; -use servo_util::geometry; -use servo_util::str::DOMString; -use servo_util::smallvec::SmallVec; +use util::geometry::{Au, MAX_RECT}; +use util::geometry; +use util::str::DOMString; +use util::smallvec::SmallVec; use std::cell::{Cell, Ref, RefMut}; use std::sync::mpsc::{channel, Receiver}; use std::sync::mpsc::TryRecvError::{Empty, Disconnected}; diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index 99bb8edf60f..28b63299b61 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -24,8 +24,8 @@ use encoding::all::UTF_8; use encoding::types::{Encoding, DecoderTrap}; use servo_net::resource_task::{ProgressMsg, LoadResponse}; -use servo_util::task_state; -use servo_util::task_state::IN_HTML_PARSER; +use util::task_state; +use util::task_state::IN_HTML_PARSER; use std::ascii::AsciiExt; use std::string::CowString; use url::Url; diff --git a/components/script/script_task.rs b/components/script/script_task.rs index e41d069094a..11127f67733 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -61,10 +61,10 @@ use servo_net::image_cache_task::ImageCacheTask; use servo_net::resource_task::{ResourceTask, ControlMsg}; use servo_net::resource_task::LoadData as NetLoadData; use servo_net::storage_task::StorageTask; -use servo_util::geometry::to_frac_px; -use servo_util::smallvec::SmallVec; -use servo_util::task::spawn_named_with_send_on_failure; -use servo_util::task_state; +use util::geometry::to_frac_px; +use util::smallvec::SmallVec; +use util::task::spawn_named_with_send_on_failure; +use util::task_state; use geom::point::Point2D; use hyper::header::{Header, HeaderFormat}; diff --git a/components/script/textinput.rs b/components/script/textinput.rs index fa9ad4eacff..f741ff03b21 100644 --- a/components/script/textinput.rs +++ b/components/script/textinput.rs @@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::KeyboardEventBinding::KeyboardEventMethods; use dom::bindings::js::JSRef; use dom::keyboardevent::KeyboardEvent; -use servo_util::str::DOMString; +use util::str::DOMString; use std::borrow::ToOwned; use std::cmp::{min, max}; diff --git a/components/script/timers.rs b/components/script/timers.rs index bfcd76b95a4..d1e6f69907c 100644 --- a/components/script/timers.rs +++ b/components/script/timers.rs @@ -12,8 +12,8 @@ use dom::window::ScriptHelpers; use script_task::{ScriptChan, ScriptMsg, TimerSource}; -use servo_util::task::spawn_named; -use servo_util::str::DOMString; +use util::task::spawn_named; +use util::str::DOMString; use js::jsval::JSVal; diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 1568615c619..8864b9caf43 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -14,7 +14,7 @@ extern crate geom; extern crate libc; extern crate "msg" as servo_msg; extern crate "net" as servo_net; -extern crate "util" as servo_util; +extern crate util; extern crate url; extern crate serialize; @@ -32,7 +32,7 @@ use servo_msg::compositor_msg::ScriptListener; use servo_net::image_cache_task::ImageCacheTask; use servo_net::resource_task::ResourceTask; use servo_net::storage_task::StorageTask; -use servo_util::smallvec::SmallVec1; +use util::smallvec::SmallVec1; use std::any::Any; use std::sync::mpsc::{Sender, Receiver}; diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 6f1d22ff0bd..3325c39e34a 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -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(); diff --git a/components/servo/main.rs b/components/servo/main.rs index 127143e26e8..e6940b54af7 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -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; diff --git a/components/style/legacy.rs b/components/style/legacy.rs index 95a0f7b6db6..3aef14cafac 100644 --- a/components/style/legacy.rs +++ b/components/style/legacy.rs @@ -13,9 +13,9 @@ use properties::PropertyDeclaration; use selector_matching::{DeclarationBlock, Stylist}; use cssparser::Color; -use servo_util::geometry::Au; -use servo_util::smallvec::VecLike; -use servo_util::str::LengthOrPercentageOrAuto; +use util::geometry::Au; +use util::smallvec::VecLike; +use util::str::LengthOrPercentageOrAuto; /// Legacy presentational attributes that take a length as defined in HTML5 § 2.4.4.4. #[derive(Copy, PartialEq, Eq)] diff --git a/components/style/lib.rs b/components/style/lib.rs index 7a0ffa365d1..a9863bc1589 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -32,7 +32,7 @@ extern crate string_cache; #[macro_use] extern crate lazy_static; -extern crate "util" as servo_util; +extern crate util; pub use media_queries::{Device, MediaType}; diff --git a/components/style/media_queries.rs b/components/style/media_queries.rs index 324ac1a8ee0..37269fac18b 100644 --- a/components/style/media_queries.rs +++ b/components/style/media_queries.rs @@ -7,7 +7,7 @@ use cssparser::{Token, Parser, Delimiter}; use geom::size::TypedSize2D; use properties::longhands; -use servo_util::geometry::{Au, ViewportPx}; +use util::geometry::{Au, ViewportPx}; use values::{computed, specified}; @@ -215,7 +215,7 @@ impl MediaQueryList { #[cfg(test)] mod tests { use geom::size::TypedSize2D; - use servo_util::geometry::Au; + use util::geometry::Au; use stylesheets::{iter_stylesheet_media_rules, iter_stylesheet_style_rules, Stylesheet}; use stylesheets::Origin; use super::*; diff --git a/components/style/node.rs b/components/style/node.rs index 8bf26b932b3..df4a4864303 100644 --- a/components/style/node.rs +++ b/components/style/node.rs @@ -8,7 +8,7 @@ use cssparser::RGBA; use legacy::{IntegerAttribute, LengthAttribute, SimpleColorAttribute, UnsignedIntegerAttribute}; use selectors::AttrSelector; -use servo_util::str::LengthOrPercentageOrAuto; +use util::str::LengthOrPercentageOrAuto; use string_cache::{Atom, Namespace}; pub trait TNode<'a, E: TElement<'a>> : Clone + Copy { diff --git a/components/style/properties/mod.rs.mako b/components/style/properties/mod.rs.mako index a608dbd06e5..b63a37f4a5e 100644 --- a/components/style/properties/mod.rs.mako +++ b/components/style/properties/mod.rs.mako @@ -10,8 +10,8 @@ use std::fmt; use std::fmt::Show; use std::sync::Arc; -use servo_util::logical_geometry::{WritingMode, LogicalMargin}; -use servo_util::geometry::Au; +use util::logical_geometry::{WritingMode, LogicalMargin}; +use util::geometry::Au; use url::Url; use cssparser::{Parser, Color, RGBA, AtRuleParser, DeclarationParser, DeclarationListParser, parse_important}; @@ -183,7 +183,7 @@ pub mod longhands { <%def name="predefined_type(name, type, initial_value, parse_method='parse')"> <%self:longhand name="${name}"> #[allow(unused_imports)] - use servo_util::geometry::Au; + use util::geometry::Au; pub use values::computed::compute_${type} as to_computed_value; pub type SpecifiedValue = specified::${type}; pub mod computed_value { @@ -227,7 +227,7 @@ pub mod longhands { % for side in ["top", "right", "bottom", "left"]: <%self:longhand name="border-${side}-width"> - use servo_util::geometry::Au; + use util::geometry::Au; #[inline] pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> { @@ -235,7 +235,7 @@ pub mod longhands { } pub type SpecifiedValue = specified::Length; pub mod computed_value { - use servo_util::geometry::Au; + use util::geometry::Au; pub type T = Au; } #[inline] pub fn get_initial_value() -> computed_value::T { @@ -285,7 +285,7 @@ pub mod longhands { pub use values::computed::compute_Au as to_computed_value; pub type SpecifiedValue = super::border_top_width::SpecifiedValue; pub mod computed_value { - pub use servo_util::geometry::Au as T; + pub use util::geometry::Au as T; } </%self:longhand> @@ -491,7 +491,7 @@ pub mod longhands { } pub mod computed_value { use values::CSSFloat; - use servo_util::geometry::Au; + use util::geometry::Au; use std::fmt; #[derive(PartialEq, Copy, Clone)] pub enum T { @@ -573,7 +573,7 @@ pub mod longhands { } pub mod computed_value { use values::CSSFloat; - use servo_util::geometry::Au; + use util::geometry::Au; use std::fmt; #[allow(non_camel_case_types)] #[derive(PartialEq, Copy, Clone)] @@ -1106,10 +1106,10 @@ pub mod longhands { </%self:longhand> <%self:longhand name="font-size"> - use servo_util::geometry::Au; + use util::geometry::Au; pub type SpecifiedValue = specified::Length; // Percentages are the same as em. pub mod computed_value { - use servo_util::geometry::Au; + use util::geometry::Au; pub type T = Au; } const MEDIUM_PX: int = 16; @@ -1162,7 +1162,7 @@ pub mod longhands { <%self:longhand name="letter-spacing"> pub type SpecifiedValue = Option<specified::Length>; pub mod computed_value { - use servo_util::geometry::Au; + use util::geometry::Au; pub type T = Option<Au>; } #[inline] @@ -1186,7 +1186,7 @@ pub mod longhands { <%self:longhand name="word-spacing"> pub type SpecifiedValue = Option<specified::Length>; pub mod computed_value { - use servo_util::geometry::Au; + use util::geometry::Au; pub type T = Option<Au>; } #[inline] @@ -1410,12 +1410,12 @@ pub mod longhands { ${new_style_struct("Pointing", is_inherited=True)} <%self:longhand name="cursor"> - use servo_util::cursor as util_cursor; + use util::cursor as util_cursor; pub use super::computed_as_specified as to_computed_value; pub use self::computed_value::T as SpecifiedValue; pub mod computed_value { - use servo_util::cursor::Cursor; + use util::cursor::Cursor; #[derive(Clone, PartialEq, Eq, Copy, Show)] pub enum T { AutoCursor, @@ -1504,7 +1504,7 @@ pub mod longhands { } pub mod computed_value { - use servo_util::geometry::Au; + use util::geometry::Au; use values::computed; use std::fmt; @@ -1565,7 +1565,7 @@ pub mod longhands { } pub fn parse_one_box_shadow(input: &mut Parser) -> Result<SpecifiedBoxShadow, ()> { - use servo_util::geometry::Au; + use util::geometry::Au; let mut lengths = [specified::Length::Au(Au(0)); 4]; let mut lengths_parsed = false; let mut color = None; @@ -1629,7 +1629,7 @@ pub mod longhands { // NB: `top` and `left` are 0 if `auto` per CSS 2.1 11.1.2. pub mod computed_value { - use servo_util::geometry::Au; + use util::geometry::Au; #[derive(Clone, PartialEq, Eq, Copy, Show)] pub struct ClipRect { @@ -1669,7 +1669,7 @@ pub mod longhands { pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> { use std::ascii::AsciiExt; - use servo_util::geometry::Au; + use util::geometry::Au; use values::specified::Length; if input.try(|input| input.expect_ident_matching("auto")).is_ok() { @@ -2031,7 +2031,7 @@ pub mod shorthands { 'border-%s-radius' % (corner) for corner in ['top-left', 'top-right', 'bottom-right', 'bottom-left'] )}"> - use servo_util::geometry::Au; + use util::geometry::Au; use values::specified::{Length, LengthOrPercentage}; let _ignored = context; @@ -2503,7 +2503,7 @@ impl PropertyDeclaration { % if property.derived_from is None: "${property.name}" => { % if property.experimental: - if !::servo_util::opts::experimental_enabled() { + if !::util::opts::experimental_enabled() { return PropertyDeclarationParseResult::ExperimentalProperty } % endif @@ -2716,7 +2716,7 @@ impl ComputedValues { /// Return a WritingMode bitflags from the relevant CSS properties. fn get_writing_mode(inheritedbox_style: &style_structs::InheritedBox) -> WritingMode { - use servo_util::logical_geometry; + use util::logical_geometry; let mut flags = WritingMode::empty(); match inheritedbox_style.direction { computed_values::direction::T::ltr => {}, diff --git a/components/style/selector_matching.rs b/components/style/selector_matching.rs index 1f5688ee140..3809fd7f818 100644 --- a/components/style/selector_matching.rs +++ b/components/style/selector_matching.rs @@ -10,10 +10,10 @@ use std::sync::Arc; use url::Url; -use servo_util::bloom::BloomFilter; -use servo_util::resource_files::read_resource_file; -use servo_util::smallvec::VecLike; -use servo_util::sort; +use util::bloom::BloomFilter; +use util::resource_files::read_resource_file; +use util::smallvec::VecLike; +use util::sort; use string_cache::Atom; use legacy::PresentationalHintSynthesis; diff --git a/components/style/values.rs b/components/style/values.rs index 73a563aebbb..2772bb7dcde 100644 --- a/components/style/values.rs +++ b/components/style/values.rs @@ -56,7 +56,7 @@ pub mod specified { use cssparser::{self, Token, Parser, ToCss, CssStringWriter}; use parser::ParserContext; use text_writer::{self, TextWriter}; - use servo_util::geometry::Au; + use util::geometry::Au; use super::CSSFloat; use super::computed; @@ -675,7 +675,7 @@ pub mod computed { use properties::longhands; use std::fmt; use url::Url; - use servo_util::geometry::Au; + use util::geometry::Au; #[allow(missing_copy_implementations)] // It’s kinda big pub struct Context { diff --git a/ports/cef/browser.rs b/ports/cef/browser.rs index a4d01a03828..76f2c42f31b 100644 --- a/ports/cef/browser.rs +++ b/ports/cef/browser.rs @@ -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}; diff --git a/ports/cef/core.rs b/ports/cef/core.rs index fac8d8ac512..a5c22fc6faf 100644 --- a/ports/cef/core.rs +++ b/ports/cef/core.rs @@ -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; diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs index 73c0fa10e80..927ee5832b6 100644 --- a/ports/cef/lib.rs +++ b/ports/cef/lib.rs @@ -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; diff --git a/ports/cef/window.rs b/ports/cef/window.rs index f557dfaaeef..251bf29acd7 100644 --- a/ports/cef/window.rs +++ b/ports/cef/window.rs @@ -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; diff --git a/ports/gonk/src/lib.rs b/ports/gonk/src/lib.rs index de2f7db6098..60544549fed 100644 --- a/ports/gonk/src/lib.rs +++ b/ports/gonk/src/lib.rs @@ -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(); diff --git a/ports/gonk/src/main.rs b/ports/gonk/src/main.rs index ac86db0f074..fb3587bb958 100644 --- a/ports/gonk/src/main.rs +++ b/ports/gonk/src/main.rs @@ -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; diff --git a/ports/gonk/src/window.rs b/ports/gonk/src/window.rs index 49b04f919d3..b41d1c078c5 100644 --- a/ports/gonk/src/window.rs +++ b/ports/gonk/src/window.rs @@ -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; |