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

Derive ToCss for some counter-style descriptors

Browse source
This commit is contained in:
Anthony Ramine 2017-06-17 02:45:52 +02:00
parent 2b02a444ea
commit 3ee6598abb
1 changed files with 5 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

48
components/style/counter_style/mod.rs
View file

@ -469,7 +469,7 @@ fn bound_to_css<W>(range: Option<i32>, dest: &mut W) -> fmt::Result where W: fmt
} }
/// https://drafts.csswg.org/css-counter-styles/#counter-style-pad /// https://drafts.csswg.org/css-counter-styles/#counter-style-pad
#[derive(Debug, Clone)] #[derive(Clone, Debug, ToCss)]
pub struct Pad(pub u32, pub Symbol); pub struct Pad(pub u32, pub Symbol);
impl Parse for Pad { impl Parse for Pad {
@ -484,15 +484,8 @@ impl Parse for Pad {
} }
} }
impl ToCss for Pad {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
write!(dest, "{} ", self.0)?;
self.1.to_css(dest)
}
}
/// https://drafts.csswg.org/css-counter-styles/#counter-style-fallback /// https://drafts.csswg.org/css-counter-styles/#counter-style-fallback
#[derive(Debug, Clone)] #[derive(Clone, Debug, ToCss)]
pub struct Fallback(pub CustomIdent); pub struct Fallback(pub CustomIdent);
impl Parse for Fallback { impl Parse for Fallback {
@ -501,12 +494,6 @@ impl Parse for Fallback {
} }
} }
impl ToCss for Fallback {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
self.0.to_css(dest)
}
}
/// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-symbols /// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-symbols
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct Symbols(pub Vec<Symbol>); pub struct Symbols(pub Vec<Symbol>);
@ -542,7 +529,7 @@ impl ToCss for Symbols {
} }
/// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-additive-symbols /// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-additive-symbols
#[derive(Debug, Clone)] #[derive(Clone, Debug, ToCss)]
pub struct AdditiveSymbols(pub Vec<AdditiveTuple>); pub struct AdditiveSymbols(pub Vec<AdditiveTuple>);
impl Parse for AdditiveSymbols { impl Parse for AdditiveSymbols {
@ -556,14 +543,8 @@ impl Parse for AdditiveSymbols {
} }
} }
impl ToCss for AdditiveSymbols {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
self.0.to_css(dest)
}
}
/// <integer> && <symbol> /// <integer> && <symbol>
#[derive(Debug, Clone)] #[derive(Clone, Debug, ToCss)]
pub struct AdditiveTuple { pub struct AdditiveTuple {
/// <integer> /// <integer>
pub weight: u32, pub weight: u32,
@ -588,15 +569,8 @@ impl Parse for AdditiveTuple {
} }
} }
impl ToCss for AdditiveTuple {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
write!(dest, "{} ", self.weight)?;
self.symbol.to_css(dest)
}
}
/// https://drafts.csswg.org/css-counter-styles/#counter-style-speak-as /// https://drafts.csswg.org/css-counter-styles/#counter-style-speak-as
#[derive(Debug, Clone)] #[derive(Clone, Debug, ToCss)]
pub enum SpeakAs { pub enum SpeakAs {
/// auto /// auto
Auto, Auto,
@ -639,15 +613,3 @@ impl Parse for SpeakAs {
}) })
} }
} }
impl ToCss for SpeakAs {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self {
SpeakAs::Auto => dest.write_str("auto"),
SpeakAs::Bullets => dest.write_str("bullets"),
SpeakAs::Numbers => dest.write_str("numbers"),
SpeakAs::Words => dest.write_str("words"),
SpeakAs::Other(ref other) => other.to_css(dest),
}
}
}