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

Kill RUSTC_HAS_PR45225 🎉

Browse source
This commit is contained in:
Anthony Ramine 2018-02-28 16:31:19 +01:00
parent 169b44bc9d
commit 3abc020744
4 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/build.rs
View file

@ -76,16 +76,6 @@ fn generate_properties() {
.arg(&script) .arg(&script)
.arg(product) .arg(product)
.arg("style-crate") .arg("style-crate")
.envs(if std::mem::size_of::<Option<bool>>() == 1 {
// FIXME: remove this envs() call
// and make unconditional code that depends on RUSTC_HAS_PR45225
// once Firefox requires Rust 1.23+
// https://github.com/rust-lang/rust/pull/45225
vec![("RUSTC_HAS_PR45225", "1")]
} else {
vec![]
})
.status() .status()
.unwrap(); .unwrap();
if !status.success() { if !status.success() {

3
components/style/properties/build.py
View file

@ -32,8 +32,7 @@ def main():
properties = data.PropertiesData(product=product) properties = data.PropertiesData(product=product)
template = os.path.join(BASE, "properties.mako.rs") template = os.path.join(BASE, "properties.mako.rs")
rust = render(template, product=product, data=properties, __file__=template, rust = render(template, product=product, data=properties, __file__=template)
RUSTC_HAS_PR45225=os.environ.get("RUSTC_HAS_PR45225"))
if output == "style-crate": if output == "style-crate":
write(os.environ["OUT_DIR"], "properties.rs", rust) write(os.environ["OUT_DIR"], "properties.rs", rust)
if product == "gecko": if product == "gecko":

8
components/style/properties/longhand/inherited_svg.mako.rs
View file

@ -66,9 +66,9 @@ ${helpers.predefined_type(
"stroke-width", "SVGWidth", "stroke-width", "SVGWidth",
"::values::computed::NonNegativeLength::new(1.).into()", "::values::computed::NonNegativeLength::new(1.).into()",
products="gecko", products="gecko",
boxed=not RUSTC_HAS_PR45225,
animation_value_type="::values::computed::SVGWidth", animation_value_type="::values::computed::SVGWidth",
spec="https://www.w3.org/TR/SVG2/painting.html#StrokeWidth")} spec="https://www.w3.org/TR/SVG2/painting.html#StrokeWidth",
)}
${helpers.single_keyword("stroke-linecap", "butt round square", ${helpers.single_keyword("stroke-linecap", "butt round square",
products="gecko", animation_value_type="discrete", products="gecko", animation_value_type="discrete",
@ -101,9 +101,9 @@ ${helpers.predefined_type(
"stroke-dashoffset", "SVGLength", "stroke-dashoffset", "SVGLength",
"Au(0).into()", "Au(0).into()",
products="gecko", products="gecko",
boxed=not RUSTC_HAS_PR45225,
animation_value_type="ComputedValue", animation_value_type="ComputedValue",
spec="https://www.w3.org/TR/SVG2/painting.html#StrokeDashing")} spec="https://www.w3.org/TR/SVG2/painting.html#StrokeDashing",
)}
// Section 14 - Clipping, Masking and Compositing // Section 14 - Clipping, Masking and Compositing
${helpers.single_keyword("clip-rule", "nonzero evenodd", ${helpers.single_keyword("clip-rule", "nonzero evenodd",

1
components/style/properties/longhand/pointing.mako.rs
View file

@ -47,7 +47,6 @@ ${helpers.predefined_type(
"generics::pointing::CaretColor::Auto", "generics::pointing::CaretColor::Auto",
spec="https://drafts.csswg.org/css-ui/#caret-color", spec="https://drafts.csswg.org/css-ui/#caret-color",
animation_value_type="AnimatedCaretColor", animation_value_type="AnimatedCaretColor",
boxed=not RUSTC_HAS_PR45225,
ignored_when_colors_disabled=True, ignored_when_colors_disabled=True,
products="gecko", products="gecko",
)} )}