Skip to content

Commit c47f479

Browse files
marco-cmarco-c
committed
servo: Merge #13459 - Use parking_lot::RwLock for PropertyDeclarationBlock (from servo:no-arc-heapsize); r=emilio
<!-- Please describe your changes on the following line: --> As discussed in https://bugzilla.mozilla.org/show_bug.cgi?id=1305141 Closes #13176 --- Original PR title: Stop relying on `impl<T: HeapSizeOf> HeapSizeOf for Arc<T>` servo/heapsize#37 (comment) This builds on top of that. --- <!-- 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 refactor <!-- 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: aea9545e16fd6ea4a6b1234d1b969457313a5fa7 UltraBlame original commit: 0e74d9fe18cf1cbbab7d7410027a051f94eac90f
1 parent 99078ab commit c47f479

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1310
-977
lines changed

‎servo/components/layout/Cargo.toml

-11
Original file line numberDiff line numberDiff line change
@@ -321,22 +321,11 @@ script_traits
321321
}
322322
selectors
323323
=
324-
{
325-
version
326-
=
327324
"
328325
0
329326
.
330327
13
331328
"
332-
features
333-
=
334-
[
335-
"
336-
heap_size
337-
"
338-
]
339-
}
340329
serde_macros
341330
=
342331
"

‎servo/components/plugins/lints/unrooted_must_root.rs

-42
Original file line numberDiff line numberDiff line change
@@ -245,48 +245,6 @@ did
245245
&
246246
[
247247
"
248-
style
249-
"
250-
"
251-
refcell
252-
"
253-
"
254-
Ref
255-
"
256-
]
257-
)
258-
|
259-
|
260-
match_def_path
261-
(
262-
cx
263-
did
264-
.
265-
did
266-
&
267-
[
268-
"
269-
style
270-
"
271-
"
272-
refcell
273-
"
274-
"
275-
RefMut
276-
"
277-
]
278-
)
279-
|
280-
|
281-
match_def_path
282-
(
283-
cx
284-
did
285-
.
286-
did
287-
&
288-
[
289-
"
290248
core
291249
"
292250
"

‎servo/components/script/Cargo.toml

+7-11
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,13 @@ open
486486
.
487487
1
488488
"
489+
parking_lot
490+
=
491+
"
492+
0
493+
.
494+
3
495+
"
489496
phf
490497
=
491498
"
@@ -598,22 +605,11 @@ script_traits
598605
}
599606
selectors
600607
=
601-
{
602-
version
603-
=
604608
"
605609
0
606610
.
607611
13
608612
"
609-
features
610-
=
611-
[
612-
"
613-
heap_size
614-
"
615-
]
616-
}
617613
serde
618614
=
619615
"

‎servo/components/script/body.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -191,25 +191,25 @@ use
191191
std
192192
:
193193
:
194-
rc
194+
cell
195195
:
196196
:
197-
Rc
197+
Ref
198198
;
199199
use
200200
std
201201
:
202202
:
203-
str
204-
;
205-
use
206-
style
203+
rc
207204
:
208205
:
209-
refcell
206+
Rc
207+
;
208+
use
209+
std
210210
:
211211
:
212-
Ref
212+
str
213213
;
214214
use
215215
url

‎servo/components/script/dom/attr.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,15 @@ use
162162
std
163163
:
164164
:
165+
cell
166+
:
167+
:
168+
Ref
169+
;
170+
use
171+
std
172+
:
173+
:
165174
mem
166175
;
167176
use
@@ -185,15 +194,6 @@ AttrIdentifier
185194
AttrValue
186195
}
187196
;
188-
use
189-
style
190-
:
191-
:
192-
refcell
193-
:
194-
:
195-
Ref
196-
;
197197
#
198198
[
199199
dom_struct

‎servo/components/style/domrefcell.rs ‎servo/components/script/dom/bindings/cell.rs

+9-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
use
2-
refcell
2+
std
3+
:
4+
:
5+
cell
36
:
47
:
58
{
@@ -11,29 +14,20 @@ RefMut
1114
}
1215
;
1316
use
17+
style
18+
:
19+
:
1420
thread_state
1521
;
1622
#
1723
[
1824
derive
1925
(
2026
Clone
21-
)
22-
]
23-
#
24-
[
25-
cfg_attr
26-
(
27-
feature
28-
=
29-
"
30-
servo
31-
"
32-
derive
33-
(
27+
PartialEq
28+
Debug
3429
HeapSizeOf
3530
)
36-
)
3731
]
3832
pub
3933
struct

‎servo/components/script/dom/bindings/mod.rs

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
pub
2-
use
3-
style
4-
:
5-
:
6-
domrefcell
7-
as
8-
cell
2+
mod
3+
callback
94
;
105
pub
116
mod
12-
callback
7+
cell
138
;
149
pub
1510
mod

‎servo/components/script/dom/bindings/trace.rs

+12-9
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,18 @@ dom
5353
bindings
5454
:
5555
:
56+
cell
57+
:
58+
:
59+
DOMRefCell
60+
;
61+
use
62+
dom
63+
:
64+
:
65+
bindings
66+
:
67+
:
5668
js
5769
:
5870
:
@@ -616,15 +628,6 @@ use
616628
style
617629
:
618630
:
619-
domrefcell
620-
:
621-
:
622-
DOMRefCell
623-
;
624-
use
625-
style
626-
:
627-
:
628631
element_state
629632
:
630633
:

‎servo/components/script/dom/characterdata.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ text
192192
Text
193193
;
194194
use
195-
style
195+
std
196196
:
197197
:
198-
refcell
198+
cell
199199
:
200200
:
201201
Ref

0 commit comments

Comments
 (0)