diff options
25 files changed, 68 insertions, 68 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index fadba8af411..81edba159b7 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -53,9 +53,9 @@ use gfx::display_list::{ClippingRegion, DisplayList}; use rustc_serialize::{Encoder, Encodable}; use msg::compositor_msg::LayerId; use msg::constellation_msg::ConstellationChan; -use servo_util::geometry::{Au, MAX_AU}; -use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; -use servo_util::opts; +use util::geometry::{Au, MAX_AU}; +use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; +use util::opts; use std::cmp::{max, min}; use std::fmt; use style::computed_values::{overflow_x, overflow_y, position, box_sizing, display, float}; diff --git a/components/layout/construct.rs b/components/layout/construct.rs index b263c438149..b8dd5a8415e 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -50,7 +50,7 @@ use script::dom::element::ElementTypeId; use script::dom::htmlelement::HTMLElementTypeId; use script::dom::htmlobjectelement::is_image_data; use script::dom::node::NodeTypeId; -use servo_util::opts; +use util::opts; use std::borrow::ToOwned; use std::collections::DList; use std::mem; diff --git a/components/layout/context.rs b/components/layout/context.rs index edf5c5177b2..00d9f2139b1 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -16,7 +16,7 @@ use script::layout_interface::LayoutChan; use script_traits::UntrustedNodeAddress; use msg::constellation_msg::ConstellationChan; use net::local_image_cache::LocalImageCache; -use servo_util::geometry::Au; +use util::geometry::Au; use std::boxed; use std::cell::Cell; use std::ptr; diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs index bec5a442387..8e2002ca06f 100644 --- a/components/layout/css/matching.rs +++ b/components/layout/css/matching.rs @@ -13,9 +13,9 @@ use wrapper::{LayoutElement, LayoutNode, TLayoutNode}; use script::dom::node::NodeTypeId; use selectors::bloom::BloomFilter; -use servo_util::cache::{LRUCache, SimpleHashCache}; -use servo_util::smallvec::{SmallVec, SmallVec16}; -use servo_util::arc_ptr_eq; +use util::cache::{LRUCache, SimpleHashCache}; +use util::smallvec::{SmallVec, SmallVec16}; +use util::arc_ptr_eq; use std::borrow::ToOwned; use std::mem; use std::hash::{Hash, Hasher, Writer}; diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index b4fb0001a80..c9e82e7eb8e 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -37,10 +37,10 @@ use msg::compositor_msg::ScrollPolicy; use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::ConstellationChan; use net::image::holder::ImageHolder; -use servo_util::cursor::Cursor; -use servo_util::geometry::{self, Au, ZERO_POINT, to_px, to_frac_px}; -use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; -use servo_util::opts; +use util::cursor::Cursor; +use util::geometry::{self, Au, ZERO_POINT, to_px, to_frac_px}; +use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; +use util::opts; use std::cmp; use std::default::Default; use std::iter::repeat; diff --git a/components/layout/floats.rs b/components/layout/floats.rs index 7fb155800f9..9c83322c1c7 100644 --- a/components/layout/floats.rs +++ b/components/layout/floats.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::geometry::Au; -use servo_util::logical_geometry::WritingMode; -use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; -use servo_util::persistent_list::PersistentList; +use util::geometry::Au; +use util::logical_geometry::WritingMode; +use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; +use util::persistent_list::PersistentList; use std::cmp::{max, min}; use std::i32; use std::fmt; diff --git a/components/layout/flow.rs b/components/layout/flow.rs index ec618e03847..90cdc8a8030 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -51,8 +51,8 @@ use gfx::display_list::ClippingRegion; use rustc_serialize::{Encoder, Encodable}; use msg::constellation_msg::ConstellationChan; use msg::compositor_msg::LayerId; -use servo_util::geometry::{Au, ZERO_RECT}; -use servo_util::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; +use util::geometry::{Au, ZERO_RECT}; +use util::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; use std::mem; use std::fmt; use std::iter::Zip; diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 205e7324d12..4d66a76b582 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -33,11 +33,11 @@ use rustc_serialize::{Encodable, Encoder}; use msg::constellation_msg::{ConstellationChan, Msg, PipelineId, SubpageId}; use net::image::holder::ImageHolder; use net::local_image_cache::LocalImageCache; -use servo_util::geometry::{self, Au, ZERO_POINT}; -use servo_util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin}; -use servo_util::range::*; -use servo_util::smallvec::SmallVec; -use servo_util::str::is_whitespace; +use util::geometry::{self, Au, ZERO_POINT}; +use util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin}; +use util::range::*; +use util::smallvec::SmallVec; +use util::str::is_whitespace; use std::borrow::ToOwned; use std::cmp::{max, min}; use std::collections::DList; diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 0a4b575c3c4..a1bc2af0ae2 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -24,10 +24,10 @@ use geom::{Point2D, Rect}; use gfx::font::FontMetrics; use gfx::font_context::FontContext; use gfx::text::glyph::CharIndex; -use servo_util::arc_ptr_eq; -use servo_util::geometry::{Au, ZERO_RECT}; -use servo_util::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; -use servo_util::range::{Range, RangeIndex}; +use util::arc_ptr_eq; +use util::geometry::{Au, ZERO_RECT}; +use util::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; +use util::range::{Range, RangeIndex}; use std::cmp::max; use std::fmt; use std::mem; diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index e55805486b3..793bc083723 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -53,16 +53,16 @@ use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, Pipel use net::image_cache_task::{ImageCacheTask, ImageResponseMsg}; use net::local_image_cache::{ImageResponder, LocalImageCache}; use net::resource_task::{ResourceTask, load_bytes_iter}; -use servo_util::cursor::Cursor; -use servo_util::geometry::Au; -use servo_util::logical_geometry::LogicalPoint; -use servo_util::opts; -use servo_util::smallvec::{SmallVec, SmallVec1, VecLike}; -use servo_util::task::spawn_named_with_send_on_failure; -use servo_util::task_state; -use servo_util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan}; -use servo_util::time::{TimerMetadataFrameType, TimerMetadataReflowType, profile}; -use servo_util::workqueue::WorkQueue; +use util::cursor::Cursor; +use util::geometry::Au; +use util::logical_geometry::LogicalPoint; +use util::opts; +use util::smallvec::{SmallVec, SmallVec1, VecLike}; +use util::task::spawn_named_with_send_on_failure; +use util::task_state; +use util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan}; +use util::time::{TimerMetadataFrameType, TimerMetadataReflowType, profile}; +use util::workqueue::WorkQueue; use std::borrow::ToOwned; use std::cell::Cell; use std::ops::{Deref, DerefMut}; diff --git a/components/layout/lib.rs b/components/layout/lib.rs index eb6bbff2ca3..6eb177f6f94 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -43,7 +43,7 @@ extern crate net; extern crate msg; extern crate selectors; #[macro_use] -extern crate "util" as servo_util; +extern crate util; #[no_link] #[macro_use] #[plugin] extern crate string_cache_macros; diff --git a/components/layout/list_item.rs b/components/layout/list_item.rs index eedb2d3b6b6..84c713af944 100644 --- a/components/layout/list_item.rs +++ b/components/layout/list_item.rs @@ -18,9 +18,9 @@ use wrapper::ThreadSafeLayoutNode; use geom::{Point2D, Rect}; use gfx::display_list::DisplayList; -use servo_util::geometry::Au; -use servo_util::logical_geometry::LogicalRect; -use servo_util::opts; +use util::geometry::Au; +use util::logical_geometry::LogicalRect; +use util::opts; use style::properties::ComputedValues; use style::computed_values::list_style_type; use std::sync::Arc; diff --git a/components/layout/model.rs b/components/layout/model.rs index d62a8390351..4f617629f42 100644 --- a/components/layout/model.rs +++ b/components/layout/model.rs @@ -11,8 +11,8 @@ use fragment::Fragment; use geom::SideOffsets2D; use style::values::computed::{LengthOrPercentageOrAuto, LengthOrPercentageOrNone, LengthOrPercentage}; use style::properties::ComputedValues; -use servo_util::geometry::Au; -use servo_util::logical_geometry::LogicalMargin; +use util::geometry::Au; +use util::logical_geometry::LogicalMargin; use std::cmp::{max, min}; use std::fmt; diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index 015ed2d08d5..ee2ca416cd1 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -20,9 +20,9 @@ use wrapper::{layout_node_to_unsafe_layout_node, layout_node_from_unsafe_layout_ use wrapper::{PostorderNodeMutTraversal, UnsafeLayoutNode}; use wrapper::{PreorderDomTraversal, PostorderDomTraversal}; -use servo_util::opts; -use servo_util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan, profile}; -use servo_util::workqueue::{WorkQueue, WorkUnit, WorkerProxy}; +use util::opts; +use util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan, profile}; +use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy}; use std::mem; use std::ptr; use std::sync::atomic::{AtomicInt, Ordering}; diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs index ff2bd948c51..7007fdfa427 100644 --- a/components/layout/sequential.rs +++ b/components/layout/sequential.rs @@ -17,8 +17,8 @@ use wrapper::{PostorderNodeMutTraversal}; use wrapper::{PreorderDomTraversal, PostorderDomTraversal}; use geom::point::Point2D; -use servo_util::geometry::{Au, ZERO_POINT}; -use servo_util::opts; +use util::geometry::{Au, ZERO_POINT}; +use util::opts; pub fn traverse_dom_preorder(root: LayoutNode, shared_layout_context: &SharedLayoutContext) { diff --git a/components/layout/table.rs b/components/layout/table.rs index 270143a21da..9679938b2e7 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -21,8 +21,8 @@ use table_wrapper::TableLayout; use wrapper::ThreadSafeLayoutNode; use geom::{Point2D, Rect}; -use servo_util::geometry::Au; -use servo_util::logical_geometry::LogicalRect; +use util::geometry::Au; +use util::logical_geometry::LogicalRect; use std::cmp::max; use std::fmt; use style::properties::ComputedValues; diff --git a/components/layout/table_caption.rs b/components/layout/table_caption.rs index 43eaacf9384..ceb6bf7e3aa 100644 --- a/components/layout/table_caption.rs +++ b/components/layout/table_caption.rs @@ -14,8 +14,8 @@ use fragment::FragmentBorderBoxIterator; use wrapper::ThreadSafeLayoutNode; use geom::{Point2D, Rect}; -use servo_util::geometry::Au; -use servo_util::logical_geometry::LogicalRect; +use util::geometry::Au; +use util::logical_geometry::LogicalRect; use std::fmt; use style::properties::ComputedValues; use std::sync::Arc; diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs index 670dcf7b344..f018e72c2c3 100644 --- a/components/layout/table_cell.rs +++ b/components/layout/table_cell.rs @@ -16,8 +16,8 @@ use table::InternalTable; use wrapper::ThreadSafeLayoutNode; use geom::{Point2D, Rect}; -use servo_util::geometry::Au; -use servo_util::logical_geometry::LogicalRect; +use util::geometry::Au; +use util::logical_geometry::LogicalRect; use std::fmt; use style::properties::ComputedValues; use style::legacy::UnsignedIntegerAttribute; diff --git a/components/layout/table_colgroup.rs b/components/layout/table_colgroup.rs index 6d19a0c5778..f0ad4cff9ca 100644 --- a/components/layout/table_colgroup.rs +++ b/components/layout/table_colgroup.rs @@ -14,7 +14,7 @@ use layout_debug; use wrapper::ThreadSafeLayoutNode; use geom::{Point2D, Rect}; -use servo_util::geometry::{Au, ZERO_RECT}; +use util::geometry::{Au, ZERO_RECT}; use std::cmp::max; use std::fmt; use style::values::computed::LengthOrPercentageOrAuto; diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs index d712d7e4945..3f07e401afb 100644 --- a/components/layout/table_row.rs +++ b/components/layout/table_row.rs @@ -19,8 +19,8 @@ use model::MaybeAuto; use wrapper::ThreadSafeLayoutNode; use geom::{Point2D, Rect}; -use servo_util::geometry::Au; -use servo_util::logical_geometry::LogicalRect; +use util::geometry::Au; +use util::logical_geometry::LogicalRect; use std::cmp::max; use std::fmt; use style::properties::ComputedValues; diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs index 9728fde36a8..1596e1bfab0 100644 --- a/components/layout/table_rowgroup.rs +++ b/components/layout/table_rowgroup.rs @@ -16,8 +16,8 @@ use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable}; use wrapper::ThreadSafeLayoutNode; use geom::{Point2D, Rect}; -use servo_util::geometry::Au; -use servo_util::logical_geometry::LogicalRect; +use util::geometry::Au; +use util::logical_geometry::LogicalRect; use std::fmt; use style::properties::ComputedValues; use std::sync::Arc; diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index e849150bede..0d2b6267806 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -24,7 +24,7 @@ use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize}; use wrapper::ThreadSafeLayoutNode; use geom::{Point2D, Rect}; -use servo_util::geometry::Au; +use util::geometry::Au; use std::cmp::{max, min}; use std::fmt; use std::ops::Add; diff --git a/components/layout/text.rs b/components/layout/text.rs index 697b2301738..4c5a2a6436d 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -15,11 +15,11 @@ use gfx::font_context::FontContext; use gfx::text::glyph::CharIndex; use gfx::text::text_run::TextRun; use gfx::text::util::{self, CompressionMode}; -use servo_util::dlist; -use servo_util::geometry::Au; -use servo_util::logical_geometry::{LogicalSize, WritingMode}; -use servo_util::range::Range; -use servo_util::smallvec::{SmallVec, SmallVec1}; +use util::dlist; +use util::geometry::Au; +use util::logical_geometry::{LogicalSize, WritingMode}; +use util::range::Range; +use util::smallvec::{SmallVec, SmallVec1}; use std::collections::DList; use std::mem; use style::computed_values::{line_height, text_orientation, text_rendering, text_transform}; diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 2211cf2fcce..ceb7bf78679 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -19,8 +19,8 @@ use wrapper::{PostorderNodeMutTraversal, ThreadSafeLayoutNode, UnsafeLayoutNode} use wrapper::{PreorderDomTraversal, PostorderDomTraversal}; use selectors::bloom::BloomFilter; -use servo_util::opts; -use servo_util::tid::tid; +use util::opts; +use util::tid::tid; use style::node::TNode; use std::cell::RefCell; diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs index 2a2e00ac9ef..74b3d20ca1c 100644 --- a/components/layout/wrapper.rs +++ b/components/layout/wrapper.rs @@ -60,7 +60,7 @@ use script::dom::node::{HAS_CHANGED, IS_DIRTY, HAS_DIRTY_SIBLINGS, HAS_DIRTY_DES use script::dom::text::Text; use script::layout_interface::LayoutChan; use msg::constellation_msg::{PipelineId, SubpageId}; -use servo_util::str::{LengthOrPercentageOrAuto, is_whitespace}; +use util::str::{LengthOrPercentageOrAuto, is_whitespace}; use std::borrow::ToOwned; use std::cell::{Ref, RefMut}; use std::marker::ContravariantLifetime; |