No bug - Appease Servo's tidy lint. r=me
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sat, 23 Jun 2018 20:33:33 +0200
changeset 423452 54e3d69a23f7b347d813ce0f8c6ed515db350221
parent 423451 508b5414f8a2ed7495ca0db01d3907f0035de1c5
child 423453 65ef3341465aa8a40b5283de0d0370b20dfce5d0
push id34181
push userbtara@mozilla.com
push dateSun, 24 Jun 2018 09:37:59 +0000
treeherdermozilla-central@d69b7fc884fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
No bug - Appease Servo's tidy lint. r=me MozReview-Commit-ID: WPZYZPzuCK
servo/components/style/gecko/data.rs
servo/components/style/gecko/url.rs
servo/components/style/properties/build.py
servo/components/style/properties/declaration_block.rs
--- a/servo/components/style/gecko/data.rs
+++ b/servo/components/style/gecko/data.rs
@@ -12,18 +12,18 @@ use gecko_bindings::structs::{self, RawG
 use gecko_bindings::structs::{StyleSheetInfo, nsIDocument};
 use gecko_bindings::sugar::ownership::{HasArcFFI, HasBoxFFI, HasFFI, HasSimpleFFI};
 use invalidation::media_queries::{MediaListKey, ToMediaListKey};
 use malloc_size_of::MallocSizeOfOps;
 use media_queries::{Device, MediaList};
 use properties::ComputedValues;
 use selector_parser::SnapshotMap;
 use servo_arc::Arc;
+use shared_lock::{Locked, SharedRwLockReadGuard, StylesheetGuards};
 use std::fmt;
-use shared_lock::{Locked, SharedRwLockReadGuard, StylesheetGuards};
 use stylesheets::{CssRule, Origin, StylesheetContents, StylesheetInDocument};
 use stylist::Stylist;
 
 /// Little wrapper to a Gecko style sheet.
 #[derive(Eq, PartialEq)]
 pub struct GeckoStyleSheet(*const DomStyleSheet);
 
 impl fmt::Debug for GeckoStyleSheet {
--- a/servo/components/style/gecko/url.rs
+++ b/servo/components/style/gecko/url.rs
@@ -12,18 +12,18 @@ use gecko_bindings::structs::root::{Rust
 use gecko_bindings::structs::root::mozilla::css::{ImageValue, URLValue};
 use gecko_bindings::sugar::refptr::RefPtr;
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use nsstring::nsCString;
 use parser::{Parse, ParserContext};
 use servo_arc::{Arc, RawOffsetArc};
 use std::fmt::{self, Write};
 use std::mem;
+use style_traits::{CssWriter, ParseError, ToCss};
 use stylesheets::UrlExtraData;
-use style_traits::{CssWriter, ParseError, ToCss};
 use values::computed::{Context, ToComputedValue};
 
 /// A CSS url() value for gecko.
 #[css(function = "url")]
 #[derive(Clone, Debug, PartialEq, SpecifiedValueInfo, ToCss)]
 pub struct CssUrl {
     /// The URL in unresolved string form.
     ///
--- a/servo/components/style/properties/build.py
+++ b/servo/components/style/properties/build.py
@@ -64,26 +64,26 @@ def main():
         files[kind] = {}
         for struct in STYLE_STRUCT_LIST:
             file_name = os.path.join(BASE, kind, "{}.mako.rs".format(struct))
             if kind == "shorthands" and not os.path.exists(file_name):
                 files[kind][struct] = ""
                 continue
             files[kind][struct] = render(
                 file_name,
-                product = product,
-                data = properties,
+                product=product,
+                data=properties,
             )
     properties_template = os.path.join(BASE, "properties.mako.rs")
     files["properties"] = render(
         properties_template,
-        product = product,
-        data = properties,
-        __file__ = properties_template,
-        OUT_DIR = OUT_DIR,
+        product=product,
+        data=properties,
+        __file__=properties_template,
+        OUT_DIR=OUT_DIR,
     )
     if output == "style-crate":
         write(OUT_DIR, "properties.rs", files["properties"])
         for kind in ["longhands", "shorthands"]:
             for struct in files[kind]:
                 write(
                     os.path.join(OUT_DIR, kind),
                     "{}.rs".format(struct),
--- a/servo/components/style/properties/declaration_block.rs
+++ b/servo/components/style/properties/declaration_block.rs
@@ -7,29 +7,28 @@
 #![deny(missing_docs)]
 
 use context::QuirksMode;
 use cssparser::{DeclarationListParser, parse_important, ParserInput, CowRcStr};
 use cssparser::{Parser, AtRuleParser, DeclarationParser, Delimiter, ParseErrorKind};
 use custom_properties::CustomPropertiesBuilder;
 use error_reporting::{ParseErrorReporter, ContextualParseError};
 use parser::ParserContext;
-use properties::animated_properties::AnimationValue;
+use properties::animated_properties::{AnimationValue, AnimationValueMap};
 use shared_lock::Locked;
 use smallbitvec::{self, SmallBitVec};
 use smallvec::SmallVec;
 use std::fmt::{self, Write};
 use std::iter::{DoubleEndedIterator, Zip};
 use std::slice::Iter;
 use str::{CssString, CssStringBorrow, CssStringWriter};
 use style_traits::{CssWriter, ParseError, ParsingMode, StyleParseErrorKind, ToCss};
 use stylesheets::{CssRuleType, Origin, UrlExtraData};
 use super::*;
 use values::computed::Context;
-use properties::animated_properties::AnimationValueMap;
 
 /// The animation rules.
 ///
 /// The first one is for Animation cascade level, and the second one is for
 /// Transition cascade level.
 pub struct AnimationRules(pub Option<Arc<Locked<PropertyDeclarationBlock>>>,
                           pub Option<Arc<Locked<PropertyDeclarationBlock>>>);