sort all uses

components/gfx/display_list/mod.rs

@@ -20,8 +20,8 @@ use display_list::optimizer::DisplayListOptimizer;
 use paint_context::PaintContext;
 use self::DisplayItem::*;
 use self::DisplayItemIterator::*;
-use text::glyph::CharIndex;
 use text::TextRun;
+use text::glyph::CharIndex;
 
 use azure::azure::AzFloat;
 use azure::azure_hl::Color;

components/gfx/display_list/optimizer.rs

@@ -6,11 +6,11 @@
 
 use display_list::{DisplayItem, DisplayList, StackingContext};
 
-use std::collections::linked_list::LinkedList;
 use euclid::rect::Rect;
 use euclid::{Matrix2D, Matrix4};
-use util::geometry::{self, Au};
+use std::collections::linked_list::LinkedList;
 use std::sync::Arc;
+use util::geometry::{self, Au};
 
 /// Transforms a display list to produce a visually-equivalent, but cheaper-to-paint, one.
 pub struct DisplayListOptimizer {

components/gfx/filters.rs

@@ -7,8 +7,8 @@
 use azure::AzFloat;
 use azure::azure_hl::{ColorMatrixAttribute, ColorMatrixInput, CompositeInput, DrawTarget};
 use azure::azure_hl::{FilterNode, FilterType, LinearTransferAttribute, LinearTransferInput};
-use azure::azure_hl::{Matrix5x4, TableTransferAttribute, TableTransferInput};
 use azure::azure_hl::{GaussianBlurAttribute, GaussianBlurInput};
+use azure::azure_hl::{Matrix5x4, TableTransferAttribute, TableTransferInput};
 
 use style::computed_values::filter;
 use util::geometry::Au;

components/gfx/font.rs

@@ -5,23 +5,23 @@
 use euclid::{Point2D, Rect, Size2D};
 use smallvec::SmallVec;
 use std::borrow::ToOwned;
-use std::mem;
-use std::slice;
-use std::rc::Rc;
 use std::cell::RefCell;
-use util::cache::HashCache;
+use std::mem;
+use std::rc::Rc;
+use std::slice;
+use std::sync::Arc;
 use style::computed_values::{font_stretch, font_variant, font_weight};
 use style::properties::style_structs::Font as FontStyle;
-use std::sync::Arc;
+use util::cache::HashCache;
 
-use platform::font_context::FontContextHandle;
+use font_template::FontTemplateDescriptor;
 use platform::font::{FontHandle, FontTable};
-use util::geometry::Au;
+use platform::font_context::FontContextHandle;
+use platform::font_template::FontTemplateData;
+use text::Shaper;
 use text::glyph::{GlyphStore, GlyphId};
 use text::shaping::ShaperMethods;
-use text::Shaper;
-use font_template::FontTemplateDescriptor;
-use platform::font_template::FontTemplateData;
+use util::geometry::Au;
 
 // FontHandle encapsulates access to the platform's font API,
 // e.g. quartz, FreeType. It provides access to metrics and tables

components/gfx/font_cache_task.rs

@@ -2,11 +2,11 @@
  * 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 platform::font_context::FontContextHandle;
 use platform::font_list::get_available_families;
+use platform::font_list::get_last_resort_font_families;
 use platform::font_list::get_system_default_family;
 use platform::font_list::get_variations_for_family;
-use platform::font_list::get_last_resort_font_families;
-use platform::font_context::FontContextHandle;
 
 use font_template::{FontTemplate, FontTemplateDescriptor};
 use net_traits::{ResourceTask, load_whole_resource};

components/gfx/font_context.rs

@@ -2,15 +2,15 @@
  * 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 font::{Font, FontGroup};
 use font::SpecifiedFontStyle;
+use font::{Font, FontGroup};
 use platform::font_context::FontContextHandle;
 use style::computed_values::{font_style, font_variant};
 
+use fnv::FnvHasher;
 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::SmallVec;

components/gfx/font_template.rs

@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use font::FontHandleMethods;
-use platform::font_context::FontContextHandle;
 use platform::font::FontHandle;
+use platform::font_context::FontContextHandle;
 use platform::font_template::FontTemplateData;
 use string_cache::Atom;
 

components/gfx/paint_context.rs

@@ -4,12 +4,12 @@
 
 //! Painting of display lists using Moz2D/Azure.
 
-use gfx_traits::color;
 use display_list::TextOrientation::{SidewaysLeft, SidewaysRight, Upright};
 use display_list::{BLUR_INFLATION_FACTOR, BorderRadii, BoxShadowClipMode, ClippingRegion};
 use display_list::{TextDisplayItem};
 use filters;
 use font_context::FontContext;
+use gfx_traits::color;
 use text::TextRun;
 use text::glyph::CharIndex;
 

components/gfx/paint_task.rs

@@ -9,37 +9,37 @@ use font_cache_task::FontCacheTask;
 use font_context::FontContext;
 use paint_context::PaintContext;
 
-use azure::azure_hl::{SurfaceFormat, Color, DrawTarget, BackendType};
 use azure::AzFloat;
+use azure::azure_hl::{SurfaceFormat, Color, DrawTarget, BackendType};
 use canvas_traits::CanvasMsg;
 use euclid::Matrix4;
 use euclid::point::Point2D;
 use euclid::rect::Rect;
 use euclid::size::Size2D;
 use ipc_channel::ipc::IpcSender;
-use layers::platform::surface::{NativeDisplay, NativeSurface};
 use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet};
+use layers::platform::surface::{NativeDisplay, NativeSurface};
 use msg::compositor_msg::{Epoch, FrameTreeId, LayerId, LayerKind};
 use msg::compositor_msg::{LayerProperties, PaintListener, ScrollPolicy};
 use msg::constellation_msg::Msg as ConstellationMsg;
-use msg::constellation_msg::{ConstellationChan, Failure, PipelineId};
 use msg::constellation_msg::PipelineExitType;
+use msg::constellation_msg::{ConstellationChan, Failure, PipelineId};
 use profile_traits::mem::{self, ReportsChan};
 use profile_traits::time::{self, profile};
 use rand::{self, Rng};
-use smallvec::SmallVec;
 use skia::gl_context::GLContext;
+use smallvec::SmallVec;
 use std::borrow::ToOwned;
+use std::collections::HashMap;
 use std::mem as std_mem;
 use std::sync::Arc;
 use std::sync::mpsc::{Receiver, Select, Sender, channel};
-use std::collections::HashMap;
 use url::Url;
 use util::geometry::{Au, ZERO_POINT};
 use util::opts;
+use util::task::spawn_named;
 use util::task::spawn_named_with_send_on_failure;
 use util::task_state;
-use util::task::spawn_named;
 
 /// Information about a hardware graphics layer that layout sends to the painting task.
 #[derive(Clone, Deserialize, Serialize)]

components/gfx/platform/freetype/font.rs

@@ -6,21 +6,21 @@ extern crate freetype;
 
 use font::{FontHandleMethods, FontMetrics, FontTableMethods};
 use font::{FontTableTag, FractionalPixel};
-use util::geometry::Au;
-use util::str::c_str_to_string;
 use platform::font_context::FontContextHandle;
+use platform::font_template::FontTemplateData;
+use style::computed_values::{font_stretch, font_weight};
 use text::glyph::GlyphId;
 use text::util::{float_to_fixed, fixed_to_float};
-use style::computed_values::{font_stretch, font_weight};
-use platform::font_template::FontTemplateData;
+use util::geometry::Au;
+use util::str::c_str_to_string;
 
-use freetype::freetype::{FT_Get_Char_Index, FT_Get_Postscript_Name};
-use freetype::freetype::{FT_Load_Glyph, FT_Set_Char_Size};
-use freetype::freetype::{FT_Get_Kerning, FT_Get_Sfnt_Table};
-use freetype::freetype::{FT_New_Memory_Face, FT_Done_Face};
 use freetype::freetype::{FTErrorMethods, FT_F26Dot6, FT_Face, FT_FaceRec};
+use freetype::freetype::{FT_Get_Char_Index, FT_Get_Postscript_Name};
+use freetype::freetype::{FT_Get_Kerning, FT_Get_Sfnt_Table};
 use freetype::freetype::{FT_GlyphSlot, FT_Library, FT_Long, FT_ULong};
 use freetype::freetype::{FT_KERNING_DEFAULT, FT_STYLE_FLAG_ITALIC, FT_STYLE_FLAG_BOLD};
+use freetype::freetype::{FT_Load_Glyph, FT_Set_Char_Size};
+use freetype::freetype::{FT_New_Memory_Face, FT_Done_Face};
 use freetype::freetype::{FT_SizeRec, FT_UInt, FT_Size_Metrics, struct_FT_Vector_};
 use freetype::freetype::{ft_sfnt_os2};
 use freetype::tt_os2::TT_OS2;

components/gfx/platform/freetype/font_list.rs

@@ -10,9 +10,9 @@ extern crate fontconfig;
 use fontconfig::fontconfig::{FcChar8, FcResultMatch, FcSetSystem};
 use fontconfig::fontconfig::{FcConfigGetCurrent, FcConfigGetFonts, FcConfigSubstitute};
 use fontconfig::fontconfig::{FcDefaultSubstitute, FcFontMatch, FcNameParse, FcPatternGetString};
-use fontconfig::fontconfig::{FcPatternDestroy, FcFontSetDestroy, FcMatchPattern, FcPatternCreate};
-use fontconfig::fontconfig::{FcPatternAddString, FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy};
 use fontconfig::fontconfig::{FcObjectSetAdd, FcPatternGetInteger};
+use fontconfig::fontconfig::{FcPatternAddString, FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy};
+use fontconfig::fontconfig::{FcPatternDestroy, FcFontSetDestroy, FcMatchPattern, FcPatternCreate};
 
 use util::str::c_str_to_string;
 

components/gfx/platform/macos/font.rs

@@ -8,14 +8,14 @@ extern crate core_foundation;
 extern crate core_graphics;
 extern crate core_text;
 
-use font::{FontHandleMethods, FontMetrics, FontTableMethods};
 use font::FontTableTag;
 use font::FractionalPixel;
-use util::geometry::{Au, px_to_pt};
-use platform::macos::font_context::FontContextHandle;
-use text::glyph::GlyphId;
-use style::computed_values::{font_stretch, font_weight};
+use font::{FontHandleMethods, FontMetrics, FontTableMethods};
 use platform::font_template::FontTemplateData;
+use platform::macos::font_context::FontContextHandle;
+use style::computed_values::{font_stretch, font_weight};
+use text::glyph::GlyphId;
+use util::geometry::{Au, px_to_pt};
 
 use core_foundation::base::CFIndex;
 use core_foundation::data::CFData;

components/gfx/platform/macos/font_list.rs

@@ -4,8 +4,8 @@
 
 use core_foundation::base::TCFType;
 use core_foundation::string::{CFString, CFStringRef};
-use core_text::font_descriptor::{CTFontDescriptor, CTFontDescriptorRef};
 use core_text;
+use core_text::font_descriptor::{CTFontDescriptor, CTFontDescriptorRef};
 
 use std::borrow::ToOwned;
 use std::mem;

components/gfx/platform/macos/font_template.rs

@@ -4,8 +4,8 @@
 
 use core_graphics::data_provider::CGDataProvider;
 use core_graphics::font::CGFont;
-use core_text::font::CTFont;
 use core_text;
+use core_text::font::CTFont;
 
 use serde::de::{Error, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};

components/gfx/text/shaping/harfbuzz.rs

@@ -14,37 +14,37 @@ use text::util::{float_to_fixed, fixed_to_float, is_bidi_control};
 use euclid::Point2D;
 use harfbuzz::{HB_MEMORY_MODE_READONLY, HB_DIRECTION_LTR, HB_DIRECTION_RTL};
 use harfbuzz::{RUST_hb_blob_create, RUST_hb_face_create_for_tables};
-use harfbuzz::{hb_blob_t};
-use harfbuzz::{hb_bool_t};
 use harfbuzz::{RUST_hb_buffer_add_utf8};
 use harfbuzz::{RUST_hb_buffer_destroy};
 use harfbuzz::{RUST_hb_buffer_get_glyph_positions};
 use harfbuzz::{RUST_hb_buffer_get_length};
 use harfbuzz::{RUST_hb_buffer_set_direction};
 use harfbuzz::{RUST_hb_face_destroy};
-use harfbuzz::{hb_face_t, hb_font_t};
-use harfbuzz::{hb_feature_t};
 use harfbuzz::{RUST_hb_font_create};
 use harfbuzz::{RUST_hb_font_destroy, RUST_hb_buffer_create};
 use harfbuzz::{RUST_hb_font_funcs_create};
 use harfbuzz::{RUST_hb_font_funcs_set_glyph_func};
 use harfbuzz::{RUST_hb_font_funcs_set_glyph_h_advance_func};
 use harfbuzz::{RUST_hb_font_funcs_set_glyph_h_kerning_func};
-use harfbuzz::{hb_font_funcs_t, hb_buffer_t, hb_codepoint_t};
 use harfbuzz::{RUST_hb_font_set_funcs};
 use harfbuzz::{RUST_hb_font_set_ppem};
 use harfbuzz::{RUST_hb_font_set_scale};
+use harfbuzz::{RUST_hb_shape, RUST_hb_buffer_get_glyph_infos};
+use harfbuzz::{hb_blob_t};
+use harfbuzz::{hb_bool_t};
+use harfbuzz::{hb_face_t, hb_font_t};
+use harfbuzz::{hb_feature_t};
+use harfbuzz::{hb_font_funcs_t, hb_buffer_t, hb_codepoint_t};
 use harfbuzz::{hb_glyph_info_t};
 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 std::char;
+use std::cmp;
+use std::mem;
+use std::ptr;
 use util::geometry::Au;
 use util::range::Range;
-use std::char;
-use std::mem;
-use std::cmp;
-use std::ptr;
 
 macro_rules! hb_tag {
     ($t1:expr, $t2:expr, $t3:expr, $t4:expr) => (