Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Derive more Parse implementations (fixes #19827) #19903

Merged
merged 7 commits into from Feb 1, 2018

Rename FillRule variants to follow the same rules as other enums

  • Loading branch information
nox committed Feb 1, 2018
commit 09e304adb3e04df0653d13af468c39b9e1875cdb
@@ -707,9 +707,9 @@ pub mod basic_shape {
}
StyleBasicShapeType::Polygon => {
let fill_rule = if other.mFillRule == StyleFillRule::Evenodd {
FillRule::EvenOdd
FillRule::Evenodd
} else {
FillRule::NonZero
FillRule::Nonzero
};
let mut coords = Vec::with_capacity(other.mCoordinates.len() / 2);
for i in 0..(other.mCoordinates.len() / 2) {
@@ -5101,7 +5101,7 @@ fn static_assert() {
coord.0.to_gecko_style_coord(&mut shape.mCoordinates[2 * i]);
coord.1.to_gecko_style_coord(&mut shape.mCoordinates[2 * i + 1]);
}
shape.mFillRule = if poly.fill == FillRule::EvenOdd {
shape.mFillRule = if poly.fill == FillRule::Evenodd {
StyleFillRule::Evenodd
} else {
StyleFillRule::Nonzero
@@ -118,8 +118,8 @@ pub struct Polygon<LengthOrPercentage> {
// https://www.w3.org/TR/SVG/painting.html#FillRuleProperty
// says that it can also be `inherit`
define_css_keyword_enum!(FillRule:
"nonzero" => NonZero,
"evenodd" => EvenOdd
"nonzero" => Nonzero,
"evenodd" => Evenodd
);
add_impls_for_keyword_enum!(FillRule);

@@ -239,5 +239,5 @@ impl<L: ToCss> ToCss for Polygon<L> {

impl Default for FillRule {
#[inline]
fn default() -> Self { FillRule::NonZero }
fn default() -> Self { FillRule::Nonzero }
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.