Π·Π΅ΡΠΊΠ°Π»ΠΎ ΠΈΠ· https://github.com/mozilla/gecko-dev.git
servo: Merge #20145 - Kill RUSTC_HAS_PR45225 π (from servo:rm-rustc-hack); r=emilio
Source-Repo: https://github.com/servo/servo Source-Revision: 30f33eba9665f5ffdc0648515db7cede68778202 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : f5b8fc439def43ace755a8e48d6387f2e12d7460
This commit is contained in:
Π ΠΎΠ΄ΠΈΡΠ΅Π»Ρ
bb2196e329
ΠΠΎΠΌΠΌΠΈΡ
3c52dc749b
|
@ -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() {
|
||||||
|
|
|
@ -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":
|
||||||
|
|
|
@ -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",
|
||||||
|
|
|
@ -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",
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
1.23.0
|
1.24.0
|
||||||
|
|
ΠΠ°Π³ΡΡΠ·ΠΊΠ°β¦
Π‘ΡΡΠ»ΠΊΠ° Π² Π½ΠΎΠ²ΠΎΠΉ Π·Π°Π΄Π°ΡΠ΅