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.
This commit is contained in:
Corey Farwell 2015-06-09 22:41:43 -07:00
parent 44a4b7886d
commit 4f47b41fa7
29 changed files with 58 additions and 30 deletions

View file

@ -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 = "*"

View file

@ -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 {
)
}
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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())
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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)",

View file

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

View file

@ -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)]

View file

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

View file

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

View file

@ -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()
}

View file

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

View file

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

View file

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

View file

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

9
ports/cef/Cargo.lock generated
View file

@ -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)",

9
ports/gonk/Cargo.lock generated
View file

@ -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)",