servo: Merge #12263 - Make geckolib possible to build on stable Rust …

…(from servo:stable-geckolib); r=nox

<!-- Please describe your changes on the following line: -->

More for servo/servo#11815

r? nox

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 3d557b6f25eb9dbd084cb53bbc9a9cf93bad825b

UltraBlame original commit: 0563b21dfecef0e2f3f04f56f4f108a5dcbe85ec

servo/components/style/keyframes.rs

@@ -55,8 +55,22 @@ Copy
 Clone
 PartialEq
 PartialOrd
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 struct
@@ -318,8 +332,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 struct
@@ -385,8 +413,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 struct
@@ -537,8 +579,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 enum
@@ -563,8 +619,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 struct
@@ -618,8 +688,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 struct

servo/components/style/properties/helpers.mako.rs

@@ -1575,8 +1575,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 struct

servo/components/style/properties/helpers/animated_properties.mako.rs

@@ -391,8 +391,22 @@ Copy
 Clone
 Debug
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 enum
@@ -753,8 +767,22 @@ derive
 Clone
 Debug
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 enum

servo/components/style/properties/longhand/box.mako.rs

@@ -4504,8 +4504,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 struct
@@ -4958,8 +4972,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 enum
@@ -5051,8 +5079,22 @@ derive
 Debug
 Clone
 PartialEq
+)
+]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
 HeapSizeOf
 )
+)
 ]
 pub
 struct

servo/components/style/stylesheets.rs

@@ -319,10 +319,24 @@ KeyframesRule
 derive
 (
 Debug
-HeapSizeOf
 PartialEq
 )
 ]
+#
+[
+cfg_attr
+(
+feature
+=
+"
+servo
+"
+derive
+(
+HeapSizeOf
+)
+)
+]
 pub
 struct
 KeyframesRule

servo/ports/geckolib/Cargo.toml

@@ -116,6 +116,11 @@ servo_features
 heapsize
 "
 "
+selectors
+/
+unstable
+"
+"
 style
 /
 servo
@@ -255,22 +260,11 @@ num_cpus
 "
 selectors
 =
-{
-version
-=
 "
 0
 .
 6
 "
-features
-=
-[
-"
-unstable
-"
-]
-}
 smallvec
 =
 "