diff --git a/servo/components/style/build.rs b/servo/components/style/build.rs index 4dd0125ed0ca6..3ab9491b34a65 100644 --- a/servo/components/style/build.rs +++ b/servo/components/style/build.rs @@ -702,6 +702,101 @@ 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 ( ) diff --git a/servo/components/style/properties/build.py b/servo/components/style/properties/build.py index c32abb4d3da87..11b07cca4ca42 100644 --- a/servo/components/style/properties/build.py +++ b/servo/components/style/properties/build.py @@ -319,6 +319,19 @@ __file__ = template + +RUSTC_HAS_PR45225 += +os +. +environ +. +get +( +" +RUSTC_HAS_PR45225 +" +) ) if diff --git a/servo/components/style/properties/data.py b/servo/components/style/properties/data.py index a38061a62b123..530bc9819f0db 100644 --- a/servo/components/style/properties/data.py +++ b/servo/components/style/properties/data.py @@ -1194,6 +1194,19 @@ False " ] +" +Unexpected +value +for +boolean +arguement +: +" ++ +repr +( +arg +) return arg diff --git a/servo/components/style/properties/longhand/inherited_svg.mako.rs b/servo/components/style/properties/longhand/inherited_svg.mako.rs index ced3e93286b41..b8998d22478e8 100644 --- a/servo/components/style/properties/longhand/inherited_svg.mako.rs +++ b/servo/components/style/properties/longhand/inherited_svg.mako.rs @@ -622,9 +622,8 @@ gecko " boxed = -" -True -" +not +RUSTC_HAS_PR45225 animation_value_type = " @@ -980,9 +979,8 @@ gecko " boxed = -" -True -" +not +RUSTC_HAS_PR45225 animation_value_type = " diff --git a/servo/components/style/properties/longhand/pointing.mako.rs b/servo/components/style/properties/longhand/pointing.mako.rs index 6786330acfeac..ed11c67a10167 100644 --- a/servo/components/style/properties/longhand/pointing.mako.rs +++ b/servo/components/style/properties/longhand/pointing.mako.rs @@ -1574,7 +1574,8 @@ Auto " boxed = -True +not +RUSTC_HAS_PR45225 ignored_when_colors_disabled = True diff --git a/servo/tests/unit/stylo/build.rs b/servo/tests/unit/stylo/build.rs index 2a549bdbe6ee5..d5e7c897c5b44 100644 --- a/servo/tests/unit/stylo/build.rs +++ b/servo/tests/unit/stylo/build.rs @@ -108,6 +108,61 @@ main ( ) { +if +std +: +: +mem +: +: +size_of +: +: +< +Option +< +bool +> +> +( +) += += +1 +{ +/ +/ +https +: +/ +/ +github +. +com +/ +rust +- +lang +/ +rust +/ +pull +/ +45225 +println +! +( +" +cargo +: +rustc +- +cfg += +rustc_has_pr45225 +" +) +} let root_path = diff --git a/servo/tests/unit/stylo/size_of.rs b/servo/tests/unit/stylo/size_of.rs index d15b4ef494ff9..05e14f4bf5cae 100644 --- a/servo/tests/unit/stylo/size_of.rs +++ b/servo/tests/unit/stylo/size_of.rs @@ -632,7 +632,19 @@ image : : ImageLayer +if +cfg +! +( +rustc_has_pr45225 +) +{ +40 +} +else +{ 48 +} ) ; size_of_test @@ -646,6 +658,18 @@ image : : ImageLayer +if +cfg +! +( +rustc_has_pr45225 +) +{ +40 +} +else +{ 48 +} ) ;