Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Do not require to import ToCss in define_css_keyword_enum.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-10-24 14:22:11 +02:00
parent 2536e1ee98
commit 326f914018
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
7 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/properties/helpers.mako.rs
View file

@ -439,7 +439,7 @@
use cssparser::Parser; use cssparser::Parser;
use parser::{Parse, ParserContext}; use parser::{Parse, ParserContext};
use style_traits::{ToCss, ParseError}; use style_traits::ParseError;
define_css_keyword_enum! { T: define_css_keyword_enum! { T:
% for value in keyword.values_for(product): % for value in keyword.values_for(product):
"${value}" => ${to_rust_ident(value)}, "${value}" => ${to_rust_ident(value)},
@ -614,7 +614,6 @@
<%def name="inner_body(keyword, extra_specified=None, needs_conversion=False)"> <%def name="inner_body(keyword, extra_specified=None, needs_conversion=False)">
% if extra_specified or keyword.aliases_for(product): % if extra_specified or keyword.aliases_for(product):
use style_traits::ToCss;
define_css_keyword_enum! { SpecifiedValue: define_css_keyword_enum! { SpecifiedValue:
values { values {
% for value in keyword.values_for(product) + (extra_specified or "").split(): % for value in keyword.values_for(product) + (extra_specified or "").split():
@ -631,7 +630,6 @@
pub use self::computed_value::T as SpecifiedValue; pub use self::computed_value::T as SpecifiedValue;
% endif % endif
pub mod computed_value { pub mod computed_value {
use style_traits::ToCss;
define_css_keyword_enum! { T: define_css_keyword_enum! { T:
% for value in data.longhands_by_name[name].keyword.values_for(product): % for value in data.longhands_by_name[name].keyword.values_for(product):
"${value}" => ${to_rust_ident(value)}, "${value}" => ${to_rust_ident(value)},

3
components/style/properties/longhand/border.mako.rs
View file

@ -222,9 +222,6 @@ ${helpers.predefined_type("border-image-outset", "LengthOrNumberRect",
<%helpers:longhand name="border-image-repeat" animation_value_type="discrete" <%helpers:longhand name="border-image-repeat" animation_value_type="discrete"
flags="APPLIES_TO_FIRST_LETTER" flags="APPLIES_TO_FIRST_LETTER"
spec="https://drafts.csswg.org/css-backgrounds/#border-image-repeat"> spec="https://drafts.csswg.org/css-backgrounds/#border-image-repeat">
use style_traits::ToCss;
pub mod computed_value { pub mod computed_value {
pub use super::RepeatKeyword; pub use super::RepeatKeyword;

3
components/style/properties/longhand/inherited_text.mako.rs
View file

@ -112,7 +112,6 @@ ${helpers.single_keyword("text-align-last",
flags="APPLIES_TO_PLACEHOLDER" flags="APPLIES_TO_PLACEHOLDER"
spec="https://drafts.csswg.org/css-text/#propdef-text-align"> spec="https://drafts.csswg.org/css-text/#propdef-text-align">
pub mod computed_value { pub mod computed_value {
use style_traits::ToCss;
macro_rules! define_text_align { macro_rules! define_text_align {
( $( $name: ident ( $string: expr ) => $discriminant: expr, )+ ) => { ( $( $name: ident ( $string: expr ) => $discriminant: expr, )+ ) => {
define_css_keyword_enum! { T: define_css_keyword_enum! { T:
@ -584,8 +583,6 @@ ${helpers.predefined_type(
<%helpers:longhand name="text-emphasis-position" animation_value_type="discrete" products="gecko" <%helpers:longhand name="text-emphasis-position" animation_value_type="discrete" products="gecko"
spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position"> spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position">
use style_traits::ToCss;
define_css_keyword_enum!(HorizontalWritingModeValue: define_css_keyword_enum!(HorizontalWritingModeValue:
"over" => Over, "over" => Over,
"under" => Under); "under" => Under);

2
components/style/stylesheets/viewport_rule.rs
View file

@ -10,7 +10,7 @@
use app_units::Au; use app_units::Au;
use context::QuirksMode; use context::QuirksMode;
use cssparser::{AtRuleParser, DeclarationListParser, DeclarationParser, Parser, parse_important}; use cssparser::{AtRuleParser, DeclarationListParser, DeclarationParser, Parser, parse_important};
use cssparser::{CowRcStr, ToCss as ParserToCss}; use cssparser::CowRcStr;
use error_reporting::{ContextualParseError, ParseErrorReporter}; use error_reporting::{ContextualParseError, ParseErrorReporter};
use euclid::TypedSize2D; use euclid::TypedSize2D;
use font_metrics::get_metrics_provider_for_product; use font_metrics::get_metrics_provider_for_product;

2
components/style/values/specified/color.rs
View file

@ -46,8 +46,6 @@ pub enum Color {
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
mod gecko { mod gecko {
use style_traits::ToCss;
define_css_keyword_enum! { SpecialColorKeyword: define_css_keyword_enum! { SpecialColorKeyword:
"-moz-default-color" => MozDefaultColor, "-moz-default-color" => MozDefaultColor,
"-moz-default-background-color" => MozDefaultBackgroundColor, "-moz-default-background-color" => MozDefaultBackgroundColor,

2
components/style_traits/values.rs
View file

@ -472,7 +472,7 @@ macro_rules! __define_css_keyword_enum__actual {
} }
} }
impl ToCss for $name { impl $crate::ToCss for $name {
fn to_css<W>(&self, dest: &mut W) -> ::std::fmt::Result fn to_css<W>(&self, dest: &mut W) -> ::std::fmt::Result
where W: ::std::fmt::Write where W: ::std::fmt::Write
{ {

4
components/style_traits/viewport.rs
View file

@ -4,8 +4,8 @@
//! Helper types for the `@viewport` rule. //! Helper types for the `@viewport` rule.
use {CSSPixel, PinchZoomFactor, ParseError}; use {CSSPixel, PinchZoomFactor, ParseError, ToCss};
use cssparser::{Parser, ToCss}; use cssparser::Parser;
use euclid::TypedSize2D; use euclid::TypedSize2D;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::fmt; use std::fmt;