Fix reported test-tidy errors for unmerged import blocks

This merges import blocks that were reported by tidy as unmerged.

components/util/geometry.rs

@@ -3,20 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use cssparser::ToCss;
-
 use euclid::length::Length;
 use euclid::num::Zero;
 use euclid::point::Point2D;
 use euclid::rect::Rect;
 use euclid::size::Size2D;
-
+use rustc_serialize::{Encoder, Encodable};
 use std::default::Default;
 use std::fmt;
 use std::i32;
 use std::ops::{Add, Sub, Neg, Mul, Div, Rem};
 
-use rustc_serialize::{Encoder, Encodable};
-
 // Units for use with euclid::length and euclid::scale_factor.
 
 /// A normalized "pixel" at the default resolution for the display.

components/util/ipc.rs

@@ -2,10 +2,9 @@
  * 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 opts;
-
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
+use opts;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::any::Any;
 use std::collections::HashMap;

components/util/mem.rs

@@ -4,15 +4,6 @@
 
 //! Data structure measurement.
 
-use libc::{c_void, size_t};
-use std::cell::{Cell, RefCell};
-use std::collections::{HashMap, LinkedList, hash_state};
-use std::hash::Hash;
-use std::mem::{size_of, transmute};
-use std::rc::Rc;
-use std::result::Result;
-use std::sync::Arc;
-
 use azure::azure_hl::Color;
 use cssparser::Color as CSSParserColor;
 use cssparser::{RGBA, TokenSerializationType};
@@ -30,10 +21,18 @@ use js::jsapi::Heap;
 use js::jsval::JSVal;
 use js::rust::GCMethods;
 use layers::geometry::DevicePixel;
+use libc::{c_void, size_t};
 use logical_geometry::WritingMode;
 use rand::OsRng;
 use range::Range;
 use selectors::parser::{PseudoElement, Selector, CompoundSelector, SimpleSelector, Combinator};
+use std::cell::{Cell, RefCell};
+use std::collections::{HashMap, LinkedList, hash_state};
+use std::hash::Hash;
+use std::mem::{size_of, transmute};
+use std::rc::Rc;
+use std::result::Result;
+use std::sync::Arc;
 use str::LengthOrPercentageOrAuto;
 use string_cache::atom::Atom;
 use string_cache::namespace::Namespace;

components/util/opts.rs

@@ -5,9 +5,8 @@
 //! Configuration options for a single run of the servo application. Created
 //! from command line arguments.
 
-use geometry::ScreenPx;
-
 use euclid::size::{Size2D, TypedSize2D};
+use geometry::ScreenPx;
 use getopts::Options;
 use num_cpus;
 use prefs;

components/util/str.rs

@@ -2,10 +2,8 @@
  * 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 geometry::Au;
-
 use cssparser::{self, RGBA, Color};
-
+use geometry::Au;
 use libc::c_char;
 use num_lib::ToPrimitive;
 use std::ascii::AsciiExt;

components/util/vec.rs

@@ -2,11 +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 super::smallvec::VecLike;
-
 use std::cmp::{PartialOrd, PartialEq, Ordering};
 use std::marker::PhantomData;
 use std::ops;
+use super::smallvec::VecLike;
 
 /// FIXME(pcwalton): Workaround for lack of unboxed closures. This is called in
 /// performance-critical code, so a closure is insufficient.

components/util/workqueue.rs

@@ -8,13 +8,12 @@
 //! higher-level API on top of this could allow safe fork-join parallelism.
 
 use deque::{Abort, BufferPool, Data, Empty, Stealer, Worker};
-use task::spawn_named;
-use task_state;
-
 use libc::funcs::posix88::unistd::usleep;
 use rand::{Rng, weak_rng, XorShiftRng};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc::{channel, Sender, Receiver};
+use task::spawn_named;
+use task_state;
 
 /// A unit of work.
 ///