From 326f9140180dec424a6ee1fef9a42063920e6f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 24 Oct 2017 14:22:11 +0200 Subject: [PATCH] style: Do not require to import ToCss in define_css_keyword_enum. --- components/style/properties/helpers.mako.rs | 4 +--- components/style/properties/longhand/border.mako.rs | 3 --- components/style/properties/longhand/inherited_text.mako.rs | 3 --- components/style/stylesheets/viewport_rule.rs | 2 +- components/style/values/specified/color.rs | 2 -- components/style_traits/values.rs | 2 +- components/style_traits/viewport.rs | 4 ++-- 7 files changed, 5 insertions(+), 15 deletions(-) diff --git a/components/style/properties/helpers.mako.rs b/components/style/properties/helpers.mako.rs index 2abf80a0a9b..559034078ce 100644 --- a/components/style/properties/helpers.mako.rs +++ b/components/style/properties/helpers.mako.rs @@ -439,7 +439,7 @@ use cssparser::Parser; use parser::{Parse, ParserContext}; - use style_traits::{ToCss, ParseError}; + use style_traits::ParseError; define_css_keyword_enum! { T: % for value in keyword.values_for(product): "${value}" => ${to_rust_ident(value)}, @@ -614,7 +614,6 @@ <%def name="inner_body(keyword, extra_specified=None, needs_conversion=False)"> % if extra_specified or keyword.aliases_for(product): - use style_traits::ToCss; define_css_keyword_enum! { SpecifiedValue: values { % for value in keyword.values_for(product) + (extra_specified or "").split(): @@ -631,7 +630,6 @@ pub use self::computed_value::T as SpecifiedValue; % endif pub mod computed_value { - use style_traits::ToCss; define_css_keyword_enum! { T: % for value in data.longhands_by_name[name].keyword.values_for(product): "${value}" => ${to_rust_ident(value)}, diff --git a/components/style/properties/longhand/border.mako.rs b/components/style/properties/longhand/border.mako.rs index 7e33bb886f1..070a68b85f0 100644 --- a/components/style/properties/longhand/border.mako.rs +++ b/components/style/properties/longhand/border.mako.rs @@ -222,9 +222,6 @@ ${helpers.predefined_type("border-image-outset", "LengthOrNumberRect", <%helpers:longhand name="border-image-repeat" animation_value_type="discrete" flags="APPLIES_TO_FIRST_LETTER" spec="https://drafts.csswg.org/css-backgrounds/#border-image-repeat"> - use style_traits::ToCss; - - pub mod computed_value { pub use super::RepeatKeyword; diff --git a/components/style/properties/longhand/inherited_text.mako.rs b/components/style/properties/longhand/inherited_text.mako.rs index 5416433bedd..981132730a9 100644 --- a/components/style/properties/longhand/inherited_text.mako.rs +++ b/components/style/properties/longhand/inherited_text.mako.rs @@ -112,7 +112,6 @@ ${helpers.single_keyword("text-align-last", flags="APPLIES_TO_PLACEHOLDER" spec="https://drafts.csswg.org/css-text/#propdef-text-align"> pub mod computed_value { - use style_traits::ToCss; macro_rules! define_text_align { ( $( $name: ident ( $string: expr ) => $discriminant: expr, )+ ) => { define_css_keyword_enum! { T: @@ -584,8 +583,6 @@ ${helpers.predefined_type( <%helpers:longhand name="text-emphasis-position" animation_value_type="discrete" products="gecko" spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position"> - use style_traits::ToCss; - define_css_keyword_enum!(HorizontalWritingModeValue: "over" => Over, "under" => Under); diff --git a/components/style/stylesheets/viewport_rule.rs b/components/style/stylesheets/viewport_rule.rs index ddb91955e64..710f53609b7 100644 --- a/components/style/stylesheets/viewport_rule.rs +++ b/components/style/stylesheets/viewport_rule.rs @@ -10,7 +10,7 @@ use app_units::Au; use context::QuirksMode; use cssparser::{AtRuleParser, DeclarationListParser, DeclarationParser, Parser, parse_important}; -use cssparser::{CowRcStr, ToCss as ParserToCss}; +use cssparser::CowRcStr; use error_reporting::{ContextualParseError, ParseErrorReporter}; use euclid::TypedSize2D; use font_metrics::get_metrics_provider_for_product; diff --git a/components/style/values/specified/color.rs b/components/style/values/specified/color.rs index 7a7a8593e9e..a9f83e0d471 100644 --- a/components/style/values/specified/color.rs +++ b/components/style/values/specified/color.rs @@ -46,8 +46,6 @@ pub enum Color { #[cfg(feature = "gecko")] mod gecko { - use style_traits::ToCss; - define_css_keyword_enum! { SpecialColorKeyword: "-moz-default-color" => MozDefaultColor, "-moz-default-background-color" => MozDefaultBackgroundColor, diff --git a/components/style_traits/values.rs b/components/style_traits/values.rs index 610e2020a3b..9b2b308d5d1 100644 --- a/components/style_traits/values.rs +++ b/components/style_traits/values.rs @@ -472,7 +472,7 @@ macro_rules! __define_css_keyword_enum__actual { } } - impl ToCss for $name { + impl $crate::ToCss for $name { fn to_css(&self, dest: &mut W) -> ::std::fmt::Result where W: ::std::fmt::Write { diff --git a/components/style_traits/viewport.rs b/components/style_traits/viewport.rs index 352616d941e..183c41c2a80 100644 --- a/components/style_traits/viewport.rs +++ b/components/style_traits/viewport.rs @@ -4,8 +4,8 @@ //! Helper types for the `@viewport` rule. -use {CSSPixel, PinchZoomFactor, ParseError}; -use cssparser::{Parser, ToCss}; +use {CSSPixel, PinchZoomFactor, ParseError, ToCss}; +use cssparser::Parser; use euclid::TypedSize2D; use std::ascii::AsciiExt; use std::fmt;