Auto merge of #6317 - frewsxcv:rm-util-crate-reexports, r=Ms2ger

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.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6317)
<!-- Reviewable:end -->

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

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

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;

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;

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;