Skip to content

Commit 38f9fa3

Browse files
committed
servo: Merge #18944 - Stop relying on linking details of std’s default allocator (from servo:jemallocator2); r=nox
We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment) So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults. Source-Repo: https://github.com/servo/servo Source-Revision: 07e9794306d597afe5d90d192fd32a99572c3cc3 UltraBlame original commit: 921526150768f9a2e9ba1586a350583f9ad025c9
1 parent a35596e commit 38f9fa3

File tree

20 files changed

+1248
-458
lines changed

20 files changed

+1248
-458
lines changed

servo/Cargo.lock

+428-31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

servo/components/allocator/Cargo.toml

+125
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
[
2+
package
3+
]
4+
name
5+
=
6+
"
7+
servo_allocator
8+
"
9+
version
10+
=
11+
"
12+
0
13+
.
14+
0
15+
.
16+
1
17+
"
18+
authors
19+
=
20+
[
21+
"
22+
The
23+
Servo
24+
Project
25+
Developers
26+
"
27+
]
28+
license
29+
=
30+
"
31+
MPL
32+
-
33+
2
34+
.
35+
0
36+
"
37+
publish
38+
=
39+
false
40+
[
41+
lib
42+
]
43+
path
44+
=
45+
"
46+
lib
47+
.
48+
rs
49+
"
50+
[
51+
features
52+
]
53+
unstable
54+
=
55+
[
56+
"
57+
kernel32
58+
-
59+
sys
60+
"
61+
"
62+
jemallocator
63+
"
64+
]
65+
[
66+
target
67+
.
68+
'
69+
cfg
70+
(
71+
not
72+
(
73+
windows
74+
)
75+
)
76+
'
77+
.
78+
dependencies
79+
]
80+
jemallocator
81+
=
82+
{
83+
version
84+
=
85+
"
86+
0
87+
.
88+
1
89+
.
90+
3
91+
"
92+
optional
93+
=
94+
true
95+
}
96+
[
97+
target
98+
.
99+
'
100+
cfg
101+
(
102+
windows
103+
)
104+
'
105+
.
106+
dependencies
107+
]
108+
kernel32
109+
-
110+
sys
111+
=
112+
{
113+
version
114+
=
115+
"
116+
0
117+
.
118+
2
119+
.
120+
1
121+
"
122+
optional
123+
=
124+
true
125+
}

0 commit comments

Comments
 (0)