servo: Merge #19316 - Fix Stylo tests to pass on both Stable and Nightly Rust (from servo:stylo-size-of); r=emilio

marco-c · marco-c · commit 7fe1e8bedae4 · 2019-10-02T07:18:40.000Z
This is on top of servo/servo#19285. Rust Nightly has new enum memory layout optimizations: rust-lang/rust#45225 Source-Repo: https://github.com/servo/servo Source-Revision: 17e97b9320fdb7cdb33bbc5f4d0fde0653bbf2e4 UltraBlame original commit: 6de571030d5d998dcadbd3dac602fa006395165c
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+}
 )
 ;

Original file line number	Diff line number	Diff line change
`@@ -622,9 +622,8 @@ gecko`
`622`	`622`	`"`
`623`	`623`	`boxed`
`624`	`624`	`=`
`625`		`-"`
`626`		`-True`
`627`		`-"`
	`625`	`+not`
	`626`	`+RUSTC_HAS_PR45225`
`628`	`627`	`animation_value_type`
`629`	`628`	`=`
`630`	`629`	`"`
`@@ -980,9 +979,8 @@ gecko`
`980`	`979`	`"`
`981`	`980`	`boxed`
`982`	`981`	`=`
`983`		`-"`
`984`		`-True`
`985`		`-"`
	`982`	`+not`
	`983`	`+RUSTC_HAS_PR45225`
`986`	`984`	`animation_value_type`
`987`	`985`	`=`
`988`	`986`	`"`
Original file line number	Diff line number	Diff line change
`@@ -1574,7 +1574,8 @@ Auto`
`1574`	`1574`	`"`
`1575`	`1575`	`boxed`
`1576`	`1576`	`=`
`1577`		`-True`
	`1577`	`+not`
	`1578`	`+RUSTC_HAS_PR45225`
`1578`	`1579`	`ignored_when_colors_disabled`
`1579`	`1580`	`=`
`1580`	`1581`	`True`
Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,19 @@ image`
`632`	`632`	`:`
`633`	`633`	`:`
`634`	`634`	`ImageLayer`
	`635`	`+if`
	`636`	`+cfg`
	`637`	`+!`
	`638`	`+(`
	`639`	`+rustc_has_pr45225`
	`640`	`+)`
	`641`	`+{`
	`642`	`+40`
	`643`	`+}`
	`644`	`+else`
	`645`	`+{`
`635`	`646`	`48`
	`647`	`+}`
`636`	`648`	`)`
`637`	`649`	`;`
`638`	`650`	`size_of_test`
`@@ -646,6 +658,18 @@ image`
`646`	`658`	`:`
`647`	`659`	`:`
`648`	`660`	`ImageLayer`
	`661`	`+if`
	`662`	`+cfg`
	`663`	`+!`
	`664`	`+(`
	`665`	`+rustc_has_pr45225`
	`666`	`+)`
	`667`	`+{`
	`668`	`+40`
	`669`	`+}`
	`670`	`+else`
	`671`	`+{`
`649`	`672`	`48`
	`673`	`+}`
`650`	`674`	`)`
`651`	`675`	`;`