Import the util crate as util rather than servo_util.

This used to conflict with the util crate from the standard library, which
has long since been removed.

The import in layout has not been changed because of a conflict with the
util mod there.

components/gfx/display_list/mod.rs

@@ -32,11 +32,11 @@ use libc::uintptr_t;
 use paint_task::PaintLayer;
 use servo_msg::compositor_msg::LayerId;
 use servo_net::image::base::Image;
-use servo_util::cursor::Cursor;
-use servo_util::dlist as servo_dlist;
-use servo_util::geometry::{self, Au, MAX_RECT, ZERO_RECT};
-use servo_util::range::Range;
-use servo_util::smallvec::{SmallVec, SmallVec8};
+use util::cursor::Cursor;
+use util::dlist as servo_dlist;
+use util::geometry::{self, Au, MAX_RECT, ZERO_RECT};
+use util::range::Range;
+use util::smallvec::{SmallVec, SmallVec8};
 use std::fmt;
 use std::slice::Iter;
 use std::sync::Arc;

components/gfx/display_list/optimizer.rs

@@ -8,7 +8,7 @@ use display_list::{DisplayItem, DisplayList, StackingContext};
 
 use collections::dlist::DList;
 use geom::rect::Rect;
-use servo_util::geometry::{self, Au};
+use util::geometry::{self, Au};
 use std::sync::Arc;
 
 /// Transforms a display list to produce a visually-equivalent, but cheaper-to-paint, one.

components/gfx/font.rs

@@ -8,8 +8,8 @@ use std::mem;
 use std::slice;
 use std::rc::Rc;
 use std::cell::RefCell;
-use servo_util::cache::HashCache;
-use servo_util::smallvec::{SmallVec, SmallVec8};
+use util::cache::HashCache;
+use util::smallvec::{SmallVec, SmallVec8};
 use style::computed_values::{font_stretch, font_variant, font_weight};
 use style::style_structs::Font as FontStyle;
 use std::sync::Arc;
@@ -17,7 +17,7 @@ use std::sync::Arc;
 use std::hash::Hash;
 use platform::font_context::FontContextHandle;
 use platform::font::{FontHandle, FontTable};
-use servo_util::geometry::Au;
+use util::geometry::Au;
 use text::glyph::{GlyphStore, GlyphId};
 use text::shaping::ShaperMethods;
 use text::{Shaper, TextRun};

components/gfx/font_cache_task.rs

@@ -16,8 +16,8 @@ use std::sync::mpsc::{Sender, Receiver, channel};
 use font_template::{FontTemplate, FontTemplateDescriptor};
 use platform::font_template::FontTemplateData;
 use servo_net::resource_task::{ResourceTask, load_whole_resource};
-use servo_util::task::spawn_named;
-use servo_util::str::LowercaseString;
+use util::task::spawn_named;
+use util::str::LowercaseString;
 use style::Source;
 
 /// A list of font templates that make up a given font family.

components/gfx/font_context.rs

@@ -12,10 +12,10 @@ use font_template::FontTemplateDescriptor;
 use platform::font_template::FontTemplateData;
 use font::FontHandleMethods;
 use platform::font::FontHandle;
-use servo_util::cache::HashCache;
-use servo_util::smallvec::{SmallVec, SmallVec8};
-use servo_util::geometry::Au;
-use servo_util::arc_ptr_eq;
+use util::cache::HashCache;
+use util::smallvec::{SmallVec, SmallVec8};
+use util::geometry::Au;
+use util::arc_ptr_eq;
 
 use std::borrow::ToOwned;
 use std::rc::Rc;

components/gfx/lib.rs

@@ -26,7 +26,7 @@ extern crate unicode;
 extern crate "plugins" as servo_plugins;
 extern crate "net" as servo_net;
 #[macro_use]
-extern crate "util" as servo_util;
+extern crate util;
 extern crate "msg" as servo_msg;
 extern crate style;
 extern crate time;

components/gfx/paint_context.rs

@@ -26,9 +26,9 @@ use libc::size_t;
 use libc::types::common::c99::{uint16_t, uint32_t};
 use png::PixelsByColorType;
 use servo_net::image::base::Image;
-use servo_util::geometry::{Au, MAX_RECT};
-use servo_util::opts;
-use servo_util::range::Range;
+use util::geometry::{Au, MAX_RECT};
+use util::opts;
+use util::range::Range;
 use std::default::Default;
 use std::f32;
 use std::mem;

components/gfx/paint_task.rs

@@ -25,12 +25,12 @@ use servo_msg::compositor_msg::{LayerMetadata, PaintListener, ScrollPolicy};
 use servo_msg::constellation_msg::Msg as ConstellationMsg;
 use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId};
 use servo_msg::constellation_msg::PipelineExitType;
-use servo_util::geometry::{Au, ZERO_POINT};
-use servo_util::opts;
-use servo_util::smallvec::SmallVec;
-use servo_util::task::spawn_named_with_send_on_failure;
-use servo_util::task_state;
-use servo_util::time::{TimeProfilerChan, TimeProfilerCategory, profile};
+use util::geometry::{Au, ZERO_POINT};
+use util::opts;
+use util::smallvec::SmallVec;
+use util::task::spawn_named_with_send_on_failure;
+use util::task_state;
+use util::time::{TimeProfilerChan, TimeProfilerCategory, profile};
 use std::mem;
 use std::thread::Builder;
 use std::sync::Arc;

components/gfx/platform/freetype/font.rs

@@ -6,9 +6,9 @@ extern crate freetype;
 
 use font::{FontHandleMethods, FontMetrics, FontTableMethods};
 use font::{FontTableTag, FractionalPixel};
-use servo_util::geometry::Au;
-use servo_util::geometry;
-use servo_util::str::c_str_to_string;
+use util::geometry::Au;
+use util::geometry;
+use util::str::c_str_to_string;
 use platform::font_context::FontContextHandle;
 use text::glyph::GlyphId;
 use text::util::{float_to_fixed, fixed_to_float};

components/gfx/platform/freetype/font_list.rs

@@ -20,7 +20,7 @@ use fontconfig::fontconfig::{
     FcObjectSetAdd, FcPatternGetInteger
 };
 
-use servo_util::str::c_str_to_string;
+use util::str::c_str_to_string;
 
 use libc;
 use libc::{c_int, c_char};

components/gfx/platform/macos/font.rs

@@ -11,8 +11,8 @@ extern crate core_text;
 use font::{FontHandleMethods, FontMetrics, FontTableMethods};
 use font::FontTableTag;
 use font::FractionalPixel;
-use servo_util::geometry::{Au, px_to_pt};
-use servo_util::geometry;
+use util::geometry::{Au, px_to_pt};
+use util::geometry;
 use platform::macos::font_context::FontContextHandle;
 use text::glyph::GlyphId;
 use style::computed_values::{font_stretch, font_weight};

components/gfx/text/glyph.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::vec::*;
-use servo_util::range;
-use servo_util::range::{Range, RangeIndex, EachIndex};
-use servo_util::geometry::Au;
+use util::vec::*;
+use util::range;
+use util::range::{Range, RangeIndex, EachIndex};
+use util::geometry::Au;
 
 use std::cmp::{Ordering, PartialOrd};
 use std::iter::repeat;

components/gfx/text/shaping/harfbuzz.rs

@@ -40,8 +40,8 @@ use harfbuzz::{hb_glyph_position_t};
 use harfbuzz::{hb_position_t, hb_tag_t};
 use harfbuzz::{RUST_hb_shape, RUST_hb_buffer_get_glyph_infos};
 use libc::{c_uint, c_int, c_void, c_char};
-use servo_util::geometry::Au;
-use servo_util::range::Range;
+use util::geometry::Au;
+use util::range::Range;
 use std::char;
 use std::iter::repeat;
 use std::mem;

components/gfx/text/text_run.rs

@@ -5,9 +5,9 @@
 use font::{Font, FontHandleMethods, FontMetrics, IS_WHITESPACE_SHAPING_FLAG, RunMetrics};
 use font::{ShapingOptions};
 use platform::font_template::FontTemplateData;
-use servo_util::geometry::Au;
-use servo_util::range::Range;
-use servo_util::vec::{Comparator, FullBinarySearchMethods};
+use util::geometry::Au;
+use util::range::Range;
+use util::vec::{Comparator, FullBinarySearchMethods};
 use std::cmp::Ordering;
 use std::slice::Iter;
 use std::sync::Arc;