Skip to content

Commit 3bb4eaf

Browse files
committed
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
1 parent 48cf423 commit 3bb4eaf

File tree

6 files changed

+188
-12
lines changed

6 files changed

+188
-12
lines changed

servo/components/style/keyframes.rs

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,22 @@ Copy
137137
Clone
138138
PartialEq
139139
PartialOrd
140+
)
141+
]
142+
#
143+
[
144+
cfg_attr
145+
(
146+
feature
147+
=
148+
"
149+
servo
150+
"
151+
derive
152+
(
140153
HeapSizeOf
141154
)
155+
)
142156
]
143157
pub
144158
struct
@@ -448,8 +462,22 @@ derive
448462
Debug
449463
Clone
450464
PartialEq
465+
)
466+
]
467+
#
468+
[
469+
cfg_attr
470+
(
471+
feature
472+
=
473+
"
474+
servo
475+
"
476+
derive
477+
(
451478
HeapSizeOf
452479
)
480+
)
453481
]
454482
pub
455483
struct
@@ -538,8 +566,22 @@ derive
538566
Debug
539567
Clone
540568
PartialEq
569+
)
570+
]
571+
#
572+
[
573+
cfg_attr
574+
(
575+
feature
576+
=
577+
"
578+
servo
579+
"
580+
derive
581+
(
541582
HeapSizeOf
542583
)
584+
)
543585
]
544586
pub
545587
struct
@@ -752,8 +794,22 @@ derive
752794
Debug
753795
Clone
754796
PartialEq
797+
)
798+
]
799+
#
800+
[
801+
cfg_attr
802+
(
803+
feature
804+
=
805+
"
806+
servo
807+
"
808+
derive
809+
(
755810
HeapSizeOf
756811
)
812+
)
757813
]
758814
pub
759815
enum
@@ -789,8 +845,22 @@ derive
789845
Debug
790846
Clone
791847
PartialEq
848+
)
849+
]
850+
#
851+
[
852+
cfg_attr
853+
(
854+
feature
855+
=
856+
"
857+
servo
858+
"
859+
derive
860+
(
792861
HeapSizeOf
793862
)
863+
)
794864
]
795865
pub
796866
struct
@@ -920,8 +990,22 @@ derive
920990
Debug
921991
Clone
922992
PartialEq
993+
)
994+
]
995+
#
996+
[
997+
cfg_attr
998+
(
999+
feature
1000+
=
1001+
"
1002+
servo
1003+
"
1004+
derive
1005+
(
9231006
HeapSizeOf
9241007
)
1008+
)
9251009
]
9261010
pub
9271011
struct

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1633,8 +1633,22 @@ derive
16331633
Debug
16341634
Clone
16351635
PartialEq
1636+
)
1637+
]
1638+
#
1639+
[
1640+
cfg_attr
1641+
(
1642+
feature
1643+
=
1644+
"
1645+
servo
1646+
"
1647+
derive
1648+
(
16361649
HeapSizeOf
16371650
)
1651+
)
16381652
]
16391653
pub
16401654
struct

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,22 @@ Copy
469469
Clone
470470
Debug
471471
PartialEq
472+
)
473+
]
474+
#
475+
[
476+
cfg_attr
477+
(
478+
feature
479+
=
480+
"
481+
servo
482+
"
483+
derive
484+
(
472485
HeapSizeOf
473486
)
487+
)
474488
]
475489
pub
476490
enum
@@ -831,8 +845,22 @@ derive
831845
Clone
832846
Debug
833847
PartialEq
848+
)
849+
]
850+
#
851+
[
852+
cfg_attr
853+
(
854+
feature
855+
=
856+
"
857+
servo
858+
"
859+
derive
860+
(
834861
HeapSizeOf
835862
)
863+
)
836864
]
837865
pub
838866
enum

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4562,8 +4562,22 @@ derive
45624562
Debug
45634563
Clone
45644564
PartialEq
4565+
)
4566+
]
4567+
#
4568+
[
4569+
cfg_attr
4570+
(
4571+
feature
4572+
=
4573+
"
4574+
servo
4575+
"
4576+
derive
4577+
(
45654578
HeapSizeOf
45664579
)
4580+
)
45674581
]
45684582
pub
45694583
struct
@@ -5016,8 +5030,22 @@ derive
50165030
Debug
50175031
Clone
50185032
PartialEq
5033+
)
5034+
]
5035+
#
5036+
[
5037+
cfg_attr
5038+
(
5039+
feature
5040+
=
5041+
"
5042+
servo
5043+
"
5044+
derive
5045+
(
50195046
HeapSizeOf
50205047
)
5048+
)
50215049
]
50225050
pub
50235051
enum
@@ -5109,8 +5137,22 @@ derive
51095137
Debug
51105138
Clone
51115139
PartialEq
5140+
)
5141+
]
5142+
#
5143+
[
5144+
cfg_attr
5145+
(
5146+
feature
5147+
=
5148+
"
5149+
servo
5150+
"
5151+
derive
5152+
(
51125153
HeapSizeOf
51135154
)
5155+
)
51145156
]
51155157
pub
51165158
struct

servo/components/style/stylesheets.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,10 +539,24 @@ KeyframesRule
539539
derive
540540
(
541541
Debug
542-
HeapSizeOf
543542
PartialEq
544543
)
545544
]
545+
#
546+
[
547+
cfg_attr
548+
(
549+
feature
550+
=
551+
"
552+
servo
553+
"
554+
derive
555+
(
556+
HeapSizeOf
557+
)
558+
)
559+
]
546560
pub
547561
struct
548562
KeyframesRule

servo/ports/geckolib/Cargo.toml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ servo_features
116116
heapsize
117117
"
118118
"
119+
selectors
120+
/
121+
unstable
122+
"
123+
"
119124
style
120125
/
121126
servo
@@ -255,22 +260,11 @@ num_cpus
255260
"
256261
selectors
257262
=
258-
{
259-
version
260-
=
261263
"
262264
0
263265
.
264266
6
265267
"
266-
features
267-
=
268-
[
269-
"
270-
unstable
271-
"
272-
]
273-
}
274268
smallvec
275269
=
276270
"

0 commit comments

Comments
 (0)