sorted the extern crate, mod & use declarations

components/util/deque/mod.rs

@@ -47,17 +47,15 @@
 
 // FIXME: more than likely, more atomic operations than necessary use SeqCst
 
-pub use self::Stolen::{Empty, Abort, Data};
-
 use std::marker;
-use std::mem::{forget, align_of, size_of, transmute};
+use std::mem::{align_of, forget, size_of, transmute};
 use std::ptr;
 use alloc::heap::{allocate, deallocate};
 use std::sync::Arc;
-
 use std::sync::Mutex;
 use std::sync::atomic::Ordering::{Relaxed, SeqCst};
 use std::sync::atomic::{AtomicIsize, AtomicPtr};
+pub use self::Stolen::{Abort, Data, Empty};
 
 // Once the queue is less than 1/K full, then it will be downsized. Note that
 // the deque requires that this number be less than 2.

components/util/geometry.rs

@@ -8,11 +8,11 @@ use euclid::num::Zero;
 use euclid::point::Point2D;
 use euclid::rect::Rect;
 use euclid::size::Size2D;
-use rustc_serialize::{Encoder, Encodable};
+use rustc_serialize::{Encodable, Encoder};
 use std::default::Default;
 use std::fmt;
 use std::i32;
-use std::ops::{Add, Sub, Neg, Mul, Div, Rem};
+use std::ops::{Add, Div, Mul, Neg, Rem, Sub};
 
 // Units for use with euclid::length and euclid::scale_factor.
 

components/util/lib.rs

@@ -18,15 +18,18 @@
 #![feature(step_trait)]
 #![feature(zero_one)]
 
-#![plugin(serde_macros)]
+#![plugin(plugins, serde_macros)]
 
-#[macro_use] extern crate log;
-#[macro_use] extern crate lazy_static;
-
-extern crate azure;
+#[macro_use]
+extern crate bitflags;
+#[macro_use]
+extern crate cssparser;
+#[macro_use]
+extern crate lazy_static;
+#[macro_use]
+extern crate log;
 extern crate alloc;
-#[macro_use] extern crate bitflags;
-#[macro_use] extern crate cssparser;
+extern crate azure;
 extern crate euclid;
 extern crate getopts;
 extern crate html5ever;
@@ -35,8 +38,8 @@ extern crate ipc_channel;
 extern crate js;
 extern crate layers;
 extern crate libc;
-extern crate num as num_lib;
 extern crate num_cpus;
+extern crate num as num_lib;
 extern crate rand;
 extern crate rustc_serialize;
 extern crate selectors;

components/util/logical_geometry.rs

@@ -5,9 +5,9 @@
 //! Geometry in flow-relative space.
 
 use euclid::num::Zero;
-use euclid::{Size2D, Point2D, SideOffsets2D, Rect};
-use std::cmp::{min, max};
-use std::fmt::{self, Debug, Formatter, Error};
+use euclid::{Point2D, Rect, SideOffsets2D, Size2D};
+use std::cmp::{max, min};
+use std::fmt::{self, Debug, Error, Formatter};
 use std::ops::{Add, Sub};
 
 bitflags!(
@@ -1026,4 +1026,3 @@ pub enum PhysicalSide {
     Bottom,
     Left,
 }
-

components/util/mem.rs

@@ -10,13 +10,13 @@ use cssparser::{RGBA, TokenSerializationType};
 use cursor::Cursor;
 use euclid::length::Length;
 use euclid::scale_factor::ScaleFactor;
-use euclid::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D, Matrix4};
-use geometry::{PagePx, ViewportPx, Au};
+use euclid::{Matrix2D, Matrix4, Point2D, Rect, SideOffsets2D, Size2D};
+use geometry::{Au, PagePx, ViewportPx};
 use html5ever::tree_builder::QuirksMode;
 use hyper::header::ContentType;
 use hyper::http::RawStatus;
 use hyper::method::Method;
-use hyper::mime::{Mime, TopLevel, SubLevel, Attr, Value};
+use hyper::mime::{Attr, Mime, SubLevel, TopLevel, Value};
 use js::jsapi::Heap;
 use js::jsval::JSVal;
 use js::rust::GCMethods;
@@ -25,7 +25,7 @@ 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 selectors::parser::{Combinator, CompoundSelector, PseudoElement, Selector, SimpleSelector};
 use std::cell::{Cell, RefCell};
 use std::collections::{HashMap, LinkedList, hash_state};
 use std::hash::Hash;

components/util/str.rs

@@ -2,7 +2,7 @@
  * 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 cssparser::{self, RGBA, Color};
+use cssparser::{self, Color, RGBA};
 use geometry::Au;
 use libc::c_char;
 use num_lib::ToPrimitive;
@@ -11,7 +11,7 @@ use std::borrow::ToOwned;
 use std::ffi::CStr;
 use std::iter::Filter;
 use std::ops::Deref;
-use std::str::{from_utf8, FromStr, Split};
+use std::str::{FromStr, Split, from_utf8};
 
 pub type DOMString = String;
 pub type StaticCharVec = &'static [char];

components/util/task_state.rs

@@ -8,7 +8,7 @@
 //! In release builds, `get` returns 0.  All of the other functions inline
 //! away to nothing.
 
-pub use self::imp::{initialize, get, enter, exit};
+pub use self::imp::{enter, exit, get, initialize};
 
 bitflags! {
     flags TaskState: u32 {
@@ -50,7 +50,7 @@ task_types! {
 #[cfg(debug_assertions)]
 mod imp {
     use std::cell::RefCell;
-    use super::{TaskState, TYPES};
+    use super::{TYPES, TaskState};
 
     thread_local!(static STATE: RefCell<Option<TaskState>> = RefCell::new(None));
 

components/util/taskpool.rs

@@ -16,7 +16,7 @@
 //
 
 use std::boxed::FnBox;
-use std::sync::mpsc::{channel, Sender, Receiver};
+use std::sync::mpsc::{Receiver, Sender, channel};
 use std::sync::{Arc, Mutex};
 use task::spawn_named;
 

components/util/tid.rs

@@ -4,7 +4,7 @@
 
 use std::cell::RefCell;
 use std::rc::Rc;
-use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
+use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering};
 
 static NEXT_TID: AtomicUsize = ATOMIC_USIZE_INIT;
 

components/util/vec.rs

@@ -2,7 +2,7 @@
  * 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 std::cmp::{PartialOrd, PartialEq, Ordering};
+use std::cmp::{Ordering, PartialEq, PartialOrd};
 use std::marker::PhantomData;
 use std::ops;
 use super::smallvec::VecLike;

components/util/workqueue.rs

@@ -9,9 +9,9 @@
 
 use deque::{Abort, BufferPool, Data, Empty, Stealer, Worker};
 use libc::funcs::posix88::unistd::usleep;
-use rand::{Rng, weak_rng, XorShiftRng};
+use rand::{Rng, XorShiftRng, weak_rng};
 use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::mpsc::{channel, Sender, Receiver};
+use std::sync::mpsc::{Receiver, Sender, channel};
 use task::spawn_named;
 use task_state;