aboutsummaryrefslogtreecommitdiffstats
path: root/ports/geckolib
diff options
context:
space:
mode:
Diffstat (limited to 'ports/geckolib')
-rw-r--r--ports/geckolib/data.rs2
-rw-r--r--ports/geckolib/gecko_bindings/sugar/ns_css_shadow_array.rs4
-rw-r--r--ports/geckolib/glue.rs10
-rw-r--r--ports/geckolib/string_cache/namespace.rs2
-rw-r--r--ports/geckolib/traversal.rs2
-rw-r--r--ports/geckolib/wrapper.rs14
6 files changed, 17 insertions, 17 deletions
diff --git a/ports/geckolib/data.rs b/ports/geckolib/data.rs
index 6b279510982..657084f3665 100644
--- a/ports/geckolib/data.rs
+++ b/ports/geckolib/data.rs
@@ -9,8 +9,8 @@ use num_cpus;
use std::cmp;
use std::collections::HashMap;
use std::env;
-use std::sync::mpsc::{channel, Receiver, Sender};
use std::sync::{Arc, RwLock};
+use std::sync::mpsc::{Receiver, Sender, channel};
use style::animation::Animation;
use style::context::SharedStyleContext;
use style::dom::OpaqueNode;
diff --git a/ports/geckolib/gecko_bindings/sugar/ns_css_shadow_array.rs b/ports/geckolib/gecko_bindings/sugar/ns_css_shadow_array.rs
index 6c0a0e6dc03..8537ad78a5f 100644
--- a/ports/geckolib/gecko_bindings/sugar/ns_css_shadow_array.rs
+++ b/ports/geckolib/gecko_bindings/sugar/ns_css_shadow_array.rs
@@ -5,9 +5,9 @@
use bindings::Gecko_AddRefCSSShadowArrayArbitraryThread;
use bindings::Gecko_NewCSSShadowArray;
use bindings::Gecko_ReleaseCSSShadowArrayArbitraryThread;
-use std::ops::{Deref, DerefMut};
use std::{ptr, slice};
-use structs::{nsCSSShadowArray, nsCSSShadowItem, RefPtr};
+use std::ops::{Deref, DerefMut};
+use structs::{RefPtr, nsCSSShadowArray, nsCSSShadowItem};
impl RefPtr<nsCSSShadowArray> {
pub fn replace_with_new(&mut self, len: u32) {
diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs
index 685d594d0e7..0f071662e8d 100644
--- a/ports/geckolib/glue.rs
+++ b/ports/geckolib/glue.rs
@@ -8,7 +8,6 @@ use app_units::Au;
use data::{NUM_THREADS, PerDocumentStyleData};
use env_logger;
use euclid::Size2D;
-use gecko_bindings::bindings::RawGeckoDocumentBorrowed;
use gecko_bindings::bindings::{RawGeckoDocument, RawGeckoElement, RawGeckoNode};
use gecko_bindings::bindings::{RawGeckoElementBorrowed, RawGeckoNodeBorrowed};
use gecko_bindings::bindings::{RawServoStyleSet, RawServoStyleSetBorrowedMut};
@@ -18,20 +17,21 @@ use gecko_bindings::bindings::{RawServoStyleSheetStrong, ServoComputedValuesStro
use gecko_bindings::bindings::{ServoComputedValuesBorrowedOrNull, ServoDeclarationBlock};
use gecko_bindings::bindings::{ServoDeclarationBlockBorrowed, ServoDeclarationBlockStrong};
use gecko_bindings::bindings::{ThreadSafePrincipalHolder, ThreadSafeURIHolder, nsHTMLCSSStyleSheet};
+use gecko_bindings::bindings::RawGeckoDocumentBorrowed;
use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI};
+use gecko_bindings::structs::{SheetParsingMode, nsIAtom};
use gecko_bindings::structs::ServoElementSnapshot;
use gecko_bindings::structs::nsRestyleHint;
-use gecko_bindings::structs::{SheetParsingMode, nsIAtom};
use gecko_bindings::sugar::ownership::{FFIArcHelpers, HasArcFFI, HasBoxFFI};
-use gecko_bindings::sugar::ownership::{HasSimpleFFI, HasFFI, Strong};
+use gecko_bindings::sugar::ownership::{HasFFI, HasSimpleFFI, Strong};
use gecko_string_cache::Atom;
use snapshot::GeckoElementSnapshot;
use std::mem::transmute;
use std::ptr;
use std::slice;
use std::str::from_utf8_unchecked;
-use std::sync::atomic::{AtomicBool, AtomicPtr, Ordering};
use std::sync::{Arc, Mutex};
+use std::sync::atomic::{AtomicBool, AtomicPtr, Ordering};
use style::arc_ptr_eq;
use style::context::{LocalStyleContextCreationInfo, ReflowGoal, SharedStyleContext};
use style::dom::{TDocument, TElement, TNode};
@@ -42,7 +42,7 @@ use style::parser::ParserContextExtraData;
use style::properties::{ComputedValues, PropertyDeclarationBlock, parse_one_declaration};
use style::selector_impl::PseudoElementCascadeType;
use style::sequential;
-use style::stylesheets::{Stylesheet, Origin};
+use style::stylesheets::{Origin, Stylesheet};
use style::timer::Timer;
use traversal::RecalcStyleOnly;
use url::Url;
diff --git a/ports/geckolib/string_cache/namespace.rs b/ports/geckolib/string_cache/namespace.rs
index d3d57285b5a..0884617725e 100644
--- a/ports/geckolib/string_cache/namespace.rs
+++ b/ports/geckolib/string_cache/namespace.rs
@@ -2,12 +2,12 @@
* 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 {Atom, WeakAtom};
use gecko_bindings::structs::nsIAtom;
use selectors::bloom::BloomHash;
use std::borrow::Borrow;
use std::fmt;
use std::ops::Deref;
-use {Atom, WeakAtom};
#[macro_export]
macro_rules! ns {
diff --git a/ports/geckolib/traversal.rs b/ports/geckolib/traversal.rs
index 118c4688c83..b342b8bd2a5 100644
--- a/ports/geckolib/traversal.rs
+++ b/ports/geckolib/traversal.rs
@@ -6,8 +6,8 @@ use context::StandaloneStyleContext;
use std::mem;
use style::context::{LocalStyleContext, SharedStyleContext, StyleContext};
use style::dom::OpaqueNode;
-use style::traversal::RestyleResult;
use style::traversal::{DomTraversalContext, recalc_style_at};
+use style::traversal::RestyleResult;
use wrapper::GeckoNode;
pub struct RecalcStyleOnly<'lc> {
diff --git a/ports/geckolib/wrapper.rs b/ports/geckolib/wrapper.rs
index ee731c8ad48..adf8ba007bd 100644
--- a/ports/geckolib/wrapper.rs
+++ b/ports/geckolib/wrapper.rs
@@ -5,10 +5,6 @@
#![allow(unsafe_code)]
use gecko_bindings::bindings;
-use gecko_bindings::bindings::Gecko_ClassOrClassList;
-use gecko_bindings::bindings::Gecko_GetNodeData;
-use gecko_bindings::bindings::Gecko_GetStyleContext;
-use gecko_bindings::bindings::ServoNodeData;
use gecko_bindings::bindings::{Gecko_CalcStyleDifference, Gecko_StoreStyleDifference};
use gecko_bindings::bindings::{Gecko_DropStyleChildrenIterator, Gecko_MaybeCreateStyleChildrenIterator};
use gecko_bindings::bindings::{Gecko_ElementState, Gecko_GetDocumentElement};
@@ -24,10 +20,14 @@ use gecko_bindings::bindings::{Gecko_IsUnvisitedLink, Gecko_IsVisitedLink};
use gecko_bindings::bindings::{Gecko_LocalName, Gecko_Namespace, Gecko_NodeIsElement, Gecko_SetNodeData};
use gecko_bindings::bindings::{RawGeckoDocument, RawGeckoElement, RawGeckoNode};
use gecko_bindings::bindings::{RawGeckoElementBorrowed, RawGeckoNodeBorrowed};
+use gecko_bindings::bindings::Gecko_ClassOrClassList;
+use gecko_bindings::bindings::Gecko_GetNodeData;
+use gecko_bindings::bindings::Gecko_GetStyleContext;
+use gecko_bindings::bindings::ServoNodeData;
use gecko_bindings::structs::{NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO, NODE_IS_DIRTY_FOR_SERVO};
-use gecko_bindings::structs::{nsIAtom, nsChangeHint, nsStyleContext};
+use gecko_bindings::structs::{nsChangeHint, nsIAtom, nsStyleContext};
+use gecko_bindings::sugar::ownership::{FFIArcHelpers, HasBoxFFI, HasFFI, HasSimpleFFI};
use gecko_bindings::sugar::ownership::Borrowed;
-use gecko_bindings::sugar::ownership::{HasBoxFFI, HasFFI, HasSimpleFFI, FFIArcHelpers};
use gecko_string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
use glue::GeckoDeclarationBlock;
use libc::uintptr_t;
@@ -47,8 +47,8 @@ use style::element_state::ElementState;
use style::error_reporting::StdoutErrorReporter;
use style::gecko_selector_impl::{GeckoSelectorImpl, NonTSPseudoClass, PseudoElement};
use style::parser::ParserContextExtraData;
-use style::properties::PropertyDeclarationBlock;
use style::properties::{ComputedValues, parse_style_attribute};
+use style::properties::PropertyDeclarationBlock;
use style::refcell::{Ref, RefCell, RefMut};
use style::selector_impl::ElementExt;
use style::selector_matching::ApplicableDeclarationBlock;