From 4f47b41fa7124dd9078b497e0fb3379027f405e6 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Tue, 9 Jun 2015 22:41:43 -0700 Subject: [PATCH] Remove fnv & smallvec crate reexports from util The util component specified fnv and smallvec as dependencies and publicly reexported both of them. Several other components utilized these reexports, presumably because fnv and smallvec used to live in the tree so reexporting made the transition easier. These indirect dependencies through the util component are unnecessary. This commit removes the fnv & smallvec crate reexports in the util component. It exchange, it adds fnv & smallvec as dependencies to non-util components wherever needed. Finally, it removes the fnv dependency from util as it is not utilized anywhere in the util component. --- components/gfx/Cargo.toml | 2 ++ components/gfx/display_list/mod.rs | 4 +--- components/gfx/font.rs | 2 +- components/gfx/font_context.rs | 4 ++-- components/gfx/lib.rs | 2 ++ components/layout/Cargo.toml | 2 ++ components/layout/context.rs | 2 +- components/layout/css/matching.rs | 2 +- components/layout/generated_content.rs | 3 +-- components/layout/layout_task.rs | 2 +- components/layout/lib.rs | 2 ++ components/layout/wrapper.rs | 2 +- components/script/Cargo.toml | 2 ++ components/script/dom/bindings/trace.rs | 2 +- components/script/dom/element.rs | 2 +- components/script/dom/eventtarget.rs | 2 +- components/script/lib.rs | 2 ++ components/servo/Cargo.lock | 9 ++++++++- components/style/Cargo.toml | 2 ++ components/style/legacy.rs | 2 +- components/style/lib.rs | 2 ++ components/style/node.rs | 2 +- components/style/properties.mako.rs | 3 +-- components/style/selector_matching.rs | 2 +- components/style/stylesheets.rs | 2 +- components/util/Cargo.toml | 1 - components/util/lib.rs | 6 +----- ports/cef/Cargo.lock | 9 ++++++++- ports/gonk/Cargo.lock | 9 ++++++++- 29 files changed, 58 insertions(+), 30 deletions(-) diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 4d393342f0b..f68415c67e1 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -58,6 +58,7 @@ git = "https://github.com/servo/string-cache" [dependencies] log = "*" +fnv = "1.0" url = "0.2.35" time = "0.1.12" bitflags = "*" @@ -65,6 +66,7 @@ rustc-serialize = "0.3" libc = "*" rand = "*" harfbuzz = "0.1" +smallvec = "0.1" [target.x86_64-apple-darwin.dependencies] core-foundation = "*" diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index ca2f806b891..af60a7d7737 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -40,7 +40,7 @@ use util::linked_list::prepend_from; use util::geometry::{self, Au, MAX_RECT, ZERO_RECT}; use util::mem::HeapSizeOf; use util::range::Range; -use util::smallvec::SmallVec8; +use smallvec::SmallVec8; use std::fmt; use std::slice::Iter; use std::sync::Arc; @@ -1135,5 +1135,3 @@ impl fmt::Debug for DisplayItem { ) } } - - diff --git a/components/gfx/font.rs b/components/gfx/font.rs index ec0fd7ac9d4..bff3a6da10b 100644 --- a/components/gfx/font.rs +++ b/components/gfx/font.rs @@ -3,13 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use geom::{Point2D, Rect, Size2D}; +use smallvec::SmallVec8; use std::borrow::ToOwned; use std::mem; use std::slice; use std::rc::Rc; use std::cell::RefCell; use util::cache::HashCache; -use util::smallvec::SmallVec8; use style::computed_values::{font_stretch, font_variant, font_weight}; use style::properties::style_structs::Font as FontStyle; use std::sync::Arc; diff --git a/components/gfx/font_context.rs b/components/gfx/font_context.rs index 6e6b16f25a2..4201e2ddc5f 100644 --- a/components/gfx/font_context.rs +++ b/components/gfx/font_context.rs @@ -10,12 +10,12 @@ use style::computed_values::{font_style, font_variant}; use font::FontHandleMethods; use font_cache_task::FontCacheTask; use font_template::FontTemplateDescriptor; +use fnv::FnvHasher; use platform::font::FontHandle; use platform::font_template::FontTemplateData; +use smallvec::SmallVec8; use util::cache::HashCache; -use util::fnv::FnvHasher; use util::geometry::Au; -use util::smallvec::SmallVec8; use std::borrow::{self, ToOwned}; use std::cell::RefCell; diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index a6b81be8d78..9465fcc871f 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -18,6 +18,7 @@ extern crate log; extern crate azure; #[macro_use] extern crate bitflags; +extern crate fnv; extern crate geom; extern crate layers; extern crate libc; @@ -32,6 +33,7 @@ extern crate net_traits; extern crate util; extern crate msg; extern crate rand; +extern crate smallvec; extern crate string_cache; extern crate style; extern crate skia; diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 7209aa4349d..f4a587a20d3 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -70,8 +70,10 @@ git = "https://github.com/tomaka/clock_ticks" [dependencies] log = "*" encoding = "0.2" +fnv = "1.0" url = "0.2.35" bitflags = "*" rustc-serialize = "0.3" libc = "*" cssparser = "0.3.1" +smallvec = "0.1" diff --git a/components/layout/context.rs b/components/layout/context.rs index c2bf3ad4db1..6e0aaa83dd6 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -10,6 +10,7 @@ use css::matching::{ApplicableDeclarationsCache, StyleSharingCandidateCache}; use canvas_traits::CanvasMsg; use msg::compositor_msg::LayerId; +use fnv::FnvHasher; use geom::{Rect, Size2D}; use gfx::display_list::OpaqueNode; use gfx::font_cache_task::FontCacheTask; @@ -27,7 +28,6 @@ use std::sync::{Arc, Mutex}; use std::sync::mpsc::{channel, Sender}; use style::selector_matching::Stylist; use url::Url; -use util::fnv::FnvHasher; use util::geometry::Au; use util::opts; diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs index 0fbe60645bd..8256d2b72f7 100644 --- a/components/layout/css/matching.rs +++ b/components/layout/css/matching.rs @@ -12,6 +12,7 @@ use css::node_style::StyledNode; use data::{LayoutDataAccess, LayoutDataWrapper}; use incremental::{self, RestyleDamage}; use opaque_node::OpaqueNodeMethods; +use smallvec::SmallVec16; use wrapper::{LayoutElement, LayoutNode, TLayoutNode}; use script::dom::characterdata::CharacterDataTypeId; @@ -34,7 +35,6 @@ use style::selector_matching::{Stylist, DeclarationBlock}; use util::arc_ptr_eq; use util::cache::{LRUCache, SimpleHashCache}; use util::opts; -use util::smallvec::SmallVec16; use util::vec::ForgetfulSink; pub struct ApplicableDeclarations { diff --git a/components/layout/generated_content.rs b/components/layout/generated_content.rs index fe08f9d3f85..2b2721b3e99 100644 --- a/components/layout/generated_content.rs +++ b/components/layout/generated_content.rs @@ -13,6 +13,7 @@ use flow::{self, AFFECTS_COUNTERS, Flow, HAS_COUNTER_AFFECTING_CHILDREN, Immutab use flow::{InorderFlowTraversal}; use fragment::{Fragment, GeneratedContentInfo, SpecificFragmentInfo, UnscannedTextFragmentInfo}; use incremental::{self, RESOLVE_GENERATED_CONTENT}; +use smallvec::SmallVec8; use text::TextRunScanner; use gfx::display_list::OpaqueNode; @@ -21,7 +22,6 @@ use std::sync::Arc; use style::computed_values::content::ContentItem; use style::computed_values::{display, list_style_type}; use style::properties::ComputedValues; -use util::smallvec::SmallVec8; // Decimal styles per CSS-COUNTER-STYLES § 6.1: static DECIMAL: [char; 10] = [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' ]; @@ -556,4 +556,3 @@ fn push_numeric_representation(mut value: i32, system: &[char], accumulator: &mu // Step 3. accumulator.extend(string.iter().cloned().rev()) } - diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 474b20c8001..4fd06ecbe02 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -27,6 +27,7 @@ use azure::azure::AzColor; use canvas_traits::CanvasMsg; use encoding::EncodingRef; use encoding::all::UTF_8; +use fnv::FnvHasher; use geom::matrix; use geom::point::Point2D; use geom::rect::Rect; @@ -72,7 +73,6 @@ use style::selector_matching::Stylist; use style::stylesheets::{Origin, Stylesheet, CSSRuleIteratorExt}; use url::Url; use util::cursor::Cursor; -use util::fnv::FnvHasher; use util::geometry::{Au, MAX_RECT}; use util::logical_geometry::LogicalPoint; use util::mem::HeapSizeOf; diff --git a/components/layout/lib.rs b/components/layout/lib.rs index 612060bf61d..18474898421 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -41,6 +41,7 @@ extern crate canvas_traits; extern crate clock_ticks; extern crate cssparser; extern crate encoding; +extern crate fnv; extern crate geom; extern crate gfx; extern crate gfx_traits; @@ -51,6 +52,7 @@ extern crate png; extern crate script; extern crate script_traits; extern crate selectors; +extern crate smallvec; extern crate string_cache; extern crate style; extern crate url; diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs index 06bc39be93f..7bbaaa2bfe9 100644 --- a/components/layout/wrapper.rs +++ b/components/layout/wrapper.rs @@ -60,6 +60,7 @@ use script::dom::node::{LayoutNodeHelpers, RawLayoutNodeHelpers, SharedLayoutDat use script::dom::node::{HAS_CHANGED, IS_DIRTY, HAS_DIRTY_SIBLINGS, HAS_DIRTY_DESCENDANTS}; use script::dom::text::Text; use script::layout_interface::LayoutChan; +use smallvec::VecLike; use msg::constellation_msg::{PipelineId, SubpageId}; use util::str::is_whitespace; use std::borrow::ToOwned; @@ -75,7 +76,6 @@ use selectors::parser::{NamespaceConstraint, AttrSelector}; use style::legacy::UnsignedIntegerAttribute; use style::node::{TElement, TElementAttributes, TNode}; use style::properties::{PropertyDeclaration, PropertyDeclarationBlock}; -use util::smallvec::VecLike; use url::Url; /// Allows some convenience methods on generic layout nodes. diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index b86d19a7d98..a7bc559ba7a 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -76,6 +76,7 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context" [dependencies] log = "*" encoding = "0.2" +fnv = "1.0" time = "0.1.12" bitflags = "*" rustc-serialize = "*" @@ -86,3 +87,4 @@ unicase = "0.1" num = "0.1.24" websocket = "0.12" uuid = "0.1.16" +smallvec = "0.1" diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 8d111592a24..1d6fe23c785 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -53,10 +53,10 @@ use net_traits::image_cache_task::{ImageCacheChan, ImageCacheTask}; use net_traits::storage_task::StorageType; use script_traits::ScriptControlChan; use script_traits::UntrustedNodeAddress; +use smallvec::SmallVec1; use msg::compositor_msg::ScriptListener; use msg::constellation_msg::ConstellationChan; use net_traits::image::base::Image; -use util::smallvec::SmallVec1; use util::str::{LengthOrPercentageOrAuto}; use std::cell::{Cell, RefCell}; use std::collections::{HashMap, HashSet}; diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index e0d0b79f640..47d9b62f0e9 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -61,6 +61,7 @@ use dom::nodelist::NodeList; use dom::virtualmethods::{VirtualMethods, vtable_for}; use devtools_traits::AttrInfo; +use smallvec::VecLike; use style; use style::legacy::{UnsignedIntegerAttribute, from_declaration}; use style::properties::{PropertyDeclarationBlock, PropertyDeclaration, parse_style_attribute}; @@ -70,7 +71,6 @@ use style::values::CSSFloat; use style::values::specified::{self, CSSColor, CSSRGBA}; use util::geometry::Au; use util::namespace; -use util::smallvec::VecLike; use util::str::{DOMString, LengthOrPercentageOrAuto}; use cssparser::Color; diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 4826f88227b..31bfe488f60 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -19,9 +19,9 @@ use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTargetTypeId; use dom::virtualmethods::VirtualMethods; use js::jsapi::{JS_CompileUCFunction, JS_GetFunctionObject, JS_CloneFunctionObject}; use js::jsapi::{JSContext, JSObject}; -use util::fnv::FnvHasher; use util::str::DOMString; +use fnv::FnvHasher; use libc::{c_char, size_t}; use std::borrow::ToOwned; use std::collections::hash_map::Entry::{Occupied, Vacant}; diff --git a/components/script/lib.rs b/components/script/lib.rs index afc7e945903..a51d10fea35 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -28,6 +28,7 @@ extern crate cssparser; extern crate geom; extern crate html5ever; extern crate encoding; +extern crate fnv; extern crate hyper; extern crate js; extern crate libc; @@ -42,6 +43,7 @@ extern crate canvas_traits; extern crate profile_traits; extern crate script_traits; extern crate selectors; +extern crate smallvec; extern crate util; extern crate websocket; #[macro_use] diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index f80997c094c..182cb1294f7 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -403,6 +403,7 @@ dependencies = [ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", @@ -420,6 +421,7 @@ dependencies = [ "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "skia 0.0.20130412 (git+https://github.com/servo/skia)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -650,6 +652,7 @@ dependencies = [ "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -665,6 +668,7 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -1033,6 +1037,7 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "html5ever 0.0.0 (git+https://github.com/servo/html5ever)", @@ -1050,6 +1055,7 @@ dependencies = [ "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -1162,6 +1168,7 @@ dependencies = [ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1170,6 +1177,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1260,7 +1268,6 @@ dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index cac28148dc8..326e2523a0c 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -30,6 +30,7 @@ git = "https://github.com/servo/string-cache" [dependencies] log = "*" encoding = "0.2" +fnv = "1.0" rustc-serialize = "0.3" matches = "0.1" url = "0.2.35" @@ -37,3 +38,4 @@ bitflags = "*" cssparser = "0.3.1" num = "0.1.24" lazy_static = "0.1.10" +smallvec = "0.1" diff --git a/components/style/legacy.rs b/components/style/legacy.rs index bf8e42c228d..83418e49b49 100644 --- a/components/style/legacy.rs +++ b/components/style/legacy.rs @@ -12,8 +12,8 @@ use selectors::matching::DeclarationBlock; use node::TElementAttributes; use properties::PropertyDeclaration; use selector_matching::Stylist; +use smallvec::VecLike; -use util::smallvec::VecLike; /// Legacy presentational attributes that take a nonnegative integer as defined in HTML5 § 2.4.4.2. #[derive(Copy, Clone, PartialEq, Eq)] diff --git a/components/style/lib.rs b/components/style/lib.rs index 104dda149aa..b044317f1cb 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -15,7 +15,9 @@ #[macro_use] extern crate log; #[macro_use] extern crate bitflags; +extern crate fnv; extern crate geom; +extern crate smallvec; extern crate url; #[macro_use] diff --git a/components/style/node.rs b/components/style/node.rs index dfe0913e12a..7bcf62436dd 100644 --- a/components/style/node.rs +++ b/components/style/node.rs @@ -7,7 +7,7 @@ use legacy::UnsignedIntegerAttribute; use properties::PropertyDeclaration; -use util::smallvec::VecLike; +use smallvec::VecLike; use selectors::matching::DeclarationBlock; pub use selectors::tree::{TNode, TElement}; diff --git a/components/style/properties.mako.rs b/components/style/properties.mako.rs index 5bc292e85b3..881d538a5ff 100644 --- a/components/style/properties.mako.rs +++ b/components/style/properties.mako.rs @@ -12,12 +12,12 @@ use std::fmt::Debug; use std::hash::{Hash, Hasher}; use std::sync::Arc; -use util::fnv::FnvHasher; use util::logical_geometry::{LogicalMargin, PhysicalSide, WritingMode}; use util::geometry::Au; use url::Url; use cssparser::{Parser, Color, RGBA, AtRuleParser, DeclarationParser, DeclarationListParser, parse_important, ToCss}; +use fnv::FnvHasher; use geom::SideOffsets2D; use geom::size::Size2D; @@ -5932,4 +5932,3 @@ fn compute_font_hash(font: &mut style_structs::Font) { font.font_family.hash(&mut hasher); font.hash = hasher.finish() } - diff --git a/components/style/selector_matching.rs b/components/style/selector_matching.rs index 9545ad1cf14..5963a4b29d5 100644 --- a/components/style/selector_matching.rs +++ b/components/style/selector_matching.rs @@ -10,8 +10,8 @@ use selectors::matching::DeclarationBlock as GenericDeclarationBlock; use selectors::parser::PseudoElement; use selectors::tree::TNode; use std::process; +use smallvec::VecLike; use util::resource_files::read_resource_file; -use util::smallvec::VecLike; use legacy::PresentationalHintSynthesis; use media_queries::Device; diff --git a/components/style/stylesheets.rs b/components/style/stylesheets.rs index a4eac87ce84..301c6673b04 100644 --- a/components/style/stylesheets.rs +++ b/components/style/stylesheets.rs @@ -18,7 +18,7 @@ use parser::{ParserContext, log_css_error}; use properties::{PropertyDeclarationBlock, parse_property_declaration_list}; use media_queries::{Device, MediaQueryList, parse_media_query_list}; use font_face::{FontFaceRule, parse_font_face_block}; -use util::smallvec::SmallVec2; +use smallvec::SmallVec2; use viewport::ViewportRule; diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index 3256013eb1f..5cb29749545 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -45,7 +45,6 @@ rustc-serialize = "0.3" time = "0.1.12" smallvec = "0.1" num_cpus = "0.2.2" -fnv = "1.0" cssparser = "0.3.1" num = "0.1.24" lazy_static = "0.1.10" diff --git a/components/util/lib.rs b/components/util/lib.rs index 45085733f3b..28c285b97a7 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -24,7 +24,6 @@ extern crate azure; extern crate alloc; #[macro_use] extern crate bitflags; #[macro_use] extern crate cssparser; -extern crate fnv as fnv_; extern crate geom; extern crate getopts; extern crate layers; @@ -34,15 +33,12 @@ extern crate num_cpus; extern crate rand; extern crate rustc_serialize; extern crate selectors; -extern crate smallvec as smallvec_; +extern crate smallvec; extern crate string_cache; extern crate url; use std::sync::Arc; -pub use fnv_ as fnv; -pub use smallvec_ as smallvec; - pub mod bezier; pub mod cache; pub mod cursor; diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 7e247f8efcc..a5d4bdea298 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -402,6 +402,7 @@ dependencies = [ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", @@ -419,6 +420,7 @@ dependencies = [ "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "skia 0.0.20130412 (git+https://github.com/servo/skia)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -642,6 +644,7 @@ dependencies = [ "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -657,6 +660,7 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -1013,6 +1017,7 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "html5ever 0.0.0 (git+https://github.com/servo/html5ever)", @@ -1030,6 +1035,7 @@ dependencies = [ "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -1160,6 +1166,7 @@ dependencies = [ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1168,6 +1175,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1244,7 +1252,6 @@ dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 78ee8e6da37..ba808ad162e 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -381,6 +381,7 @@ dependencies = [ "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", @@ -398,6 +399,7 @@ dependencies = [ "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "skia 0.0.20130412 (git+https://github.com/servo/skia)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -576,6 +578,7 @@ dependencies = [ "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -591,6 +594,7 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -921,6 +925,7 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "html5ever 0.0.0 (git+https://github.com/servo/html5ever)", @@ -938,6 +943,7 @@ dependencies = [ "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", @@ -1058,6 +1064,7 @@ dependencies = [ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1066,6 +1073,7 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1133,7 +1141,6 @@ dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",