Skip to content

Commit 7cf12f9

Browse files
committed
Disable jemalloc on all platforms
1 parent 64f8ae0 commit 7cf12f9

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

src/Cargo.lock

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,6 @@ dependencies = [
1515
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
1616
]
1717

18-
[[package]]
19-
name = "alloc_jemalloc"
20-
version = "0.0.0"
21-
dependencies = [
22-
"build_helper 0.1.0",
23-
"cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
24-
"compiler_builtins 0.0.0",
25-
"core 0.0.0",
26-
"libc 0.0.0",
27-
]
28-
2918
[[package]]
3019
name = "alloc_system"
3120
version = "0.0.0"
@@ -2638,7 +2627,6 @@ name = "std"
26382627
version = "0.0.0"
26392628
dependencies = [
26402629
"alloc 0.0.0",
2641-
"alloc_jemalloc 0.0.0",
26422630
"alloc_system 0.0.0",
26432631
"build_helper 0.1.0",
26442632
"cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",

src/librustc_target/spec/mod.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,11 +1182,7 @@ impl ToJson for Target {
11821182
}
11831183

11841184
fn maybe_jemalloc() -> Option<String> {
1185-
if cfg!(feature = "jemalloc") {
1186-
Some("alloc_jemalloc".to_string())
1187-
} else {
1188-
None
1189-
}
1185+
None
11901186
}
11911187

11921188
/// Either a target triple string or a path to a JSON file.

src/libstd/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ crate-type = ["dylib", "rlib"]
1414

1515
[dependencies]
1616
alloc = { path = "../liballoc" }
17-
alloc_jemalloc = { path = "../liballoc_jemalloc", optional = true }
1817
alloc_system = { path = "../liballoc_system" }
1918
panic_unwind = { path = "../libpanic_unwind", optional = true }
2019
panic_abort = { path = "../libpanic_abort" }
@@ -44,8 +43,8 @@ build_helper = { path = "../build_helper" }
4443

4544
[features]
4645
backtrace = []
47-
debug-jemalloc = ["alloc_jemalloc/debug"]
48-
jemalloc = ["alloc_jemalloc"]
46+
debug-jemalloc = []
47+
jemalloc = []
4948
force_alloc_system = []
5049
panic-unwind = ["panic_unwind"]
5150
profiler = ["profiler_builtins"]

0 commit comments

Comments
 (0)