Removed util.

components/gfx/Cargo.toml

@@ -32,6 +32,7 @@ range = {path = "../range"}
 rustc-serialize = "0.3"
 serde = "0.8"
 servo_atoms = {path = "../atoms"}
+servo_geometry = {path = "../geometry"}
 servo_url = {path = "../url"}
 serde_derive = "0.8"
 smallvec = "0.1"
@@ -39,7 +40,6 @@ style = {path = "../style"}
 style_traits = {path = "../style_traits"}
 time = "0.1.12"
 unicode-script = {version = "0.1", features = ["harfbuzz"]}
-util = {path = "../util"}
 xi-unicode = "0.0.1"
 
 [dependencies.webrender_traits]

components/gfx/display_list/mod.rs

@@ -25,6 +25,7 @@ use ipc_channel::ipc::IpcSharedMemory;
 use msg::constellation_msg::PipelineId;
 use net_traits::image::base::{Image, PixelFormat};
 use range::Range;
+use servo_geometry::{au_rect_to_f32_rect, f32_rect_to_au_rect, max_rect};
 use std::cmp::{self, Ordering};
 use std::collections::HashMap;
 use std::fmt;
@@ -33,7 +34,6 @@ use style::computed_values::{border_style, filter, image_rendering, mix_blend_mo
 use style_traits::cursor::Cursor;
 use text::TextRun;
 use text::glyph::ByteIndex;
-use util::geometry::{self, max_rect};
 use webrender_traits::{self, ColorF, GradientStop, WebGLContextId};
 
 pub use style::dom::OpaqueNode;
@@ -397,9 +397,9 @@ impl StackingContext {
                                             .pre_mul(&self.transform);
         let transform_2d = transform.to_2d();
 
-        let overflow = geometry::au_rect_to_f32_rect(self.overflow);
+        let overflow = au_rect_to_f32_rect(self.overflow);
         let overflow = transform_2d.transform_rect(&overflow);
-        geometry::f32_rect_to_au_rect(overflow)
+        f32_rect_to_au_rect(overflow)
     }
 
     pub fn print_with_tree(&self, print_tree: &mut PrintTree) {

components/gfx/font_cache_thread.rs

@@ -21,10 +21,10 @@ use std::collections::HashMap;
 use std::mem;
 use std::ops::Deref;
 use std::sync::{Arc, Mutex};
+use std::thread;
 use std::u32;
 use style::font_face::{EffectiveSources, Source};
 use style::properties::longhands::font_family::computed_value::FontFamily;
-use util::thread::spawn_named;
 use webrender_traits;
 
 /// A list of font templates that make up a given font family.
@@ -396,7 +396,7 @@ impl FontCacheThread {
         let (chan, port) = ipc::channel().unwrap();
 
         let channel_to_self = chan.clone();
-        spawn_named("FontCacheThread".to_owned(), move || {
+        thread::Builder::new().name("FontCacheThread".to_owned()).spawn(move || {
             // TODO: Allow users to specify these.
             let generic_fonts = populate_generic_fonts();
 
@@ -414,7 +414,7 @@ impl FontCacheThread {
 
             cache.refresh_local_families();
             cache.run();
-        });
+        }).expect("Thread spawning failed");
 
         FontCacheThread {
             chan: chan,

components/gfx/lib.rs

@@ -63,6 +63,7 @@ extern crate rustc_serialize;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
+extern crate servo_geometry;
 extern crate servo_url;
 #[macro_use] extern crate servo_atoms;
 #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
@@ -72,7 +73,6 @@ extern crate style;
 extern crate style_traits;
 extern crate time;
 extern crate unicode_script;
-extern crate util;
 extern crate webrender_traits;
 extern crate xi_unicode;