nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-21 22:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

update jemalloc-sys to jemalloc v5.3

Browse Source
This commit is contained in:
Rémy Rakic 2022-05-06 23:20:04 +02:00
parent 9fadabc879
commit adab1350e7
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Cargo.lock
View File

@ -1897,6 +1897,17 @@ version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
[[package]]
name = "jemalloc-sys"
version = "0.5.0+5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f655c3ecfa6b0d03634595b4b54551d4bd5ac208b9e0124873949a7ab168f70b"
dependencies = [
"cc",
"fs_extra",
"libc",
]
[[package]] [[package]]
name = "jobserver" name = "jobserver"
version = "0.1.24" version = "0.1.24"
@ -3360,9 +3371,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
name = "rustc-main" name = "rustc-main"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"jemalloc-sys",
"rustc_codegen_ssa", "rustc_codegen_ssa",
"rustc_driver", "rustc_driver",
"tikv-jemalloc-sys",
] ]
[[package]] [[package]]
@ -5234,17 +5245,6 @@ dependencies = [
name = "tier-check" name = "tier-check"
version = "0.1.0" version = "0.1.0"
[[package]]
name = "tikv-jemalloc-sys"
version = "0.4.1+5.2.1-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a26331b05179d4cb505c8d6814a7e18d298972f0a551b0e3cefccff927f86d3"
dependencies = [
"cc",
"fs_extra",
"libc",
]
[[package]] [[package]]
name = "time" name = "time"
version = "0.1.43" version = "0.1.43"

6
compiler/rustc/Cargo.toml
View File

@ -10,13 +10,13 @@ rustc_driver = { path = "../rustc_driver" }
# crate is intended to be used by codegen backends, which may not be in-tree. # crate is intended to be used by codegen backends, which may not be in-tree.
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
[dependencies.tikv-jemalloc-sys] [dependencies.jemalloc-sys]
version = '0.4.0' version = "0.5.0"
optional = true optional = true
features = ['unprefixed_malloc_on_supported_platforms'] features = ['unprefixed_malloc_on_supported_platforms']
[features] [features]
jemalloc = ['tikv-jemalloc-sys'] jemalloc = ['jemalloc-sys']
llvm = ['rustc_driver/llvm'] llvm = ['rustc_driver/llvm']
max_level_info = ['rustc_driver/max_level_info'] max_level_info = ['rustc_driver/max_level_info']
rustc_use_parallel_compiler = ['rustc_driver/rustc_use_parallel_compiler'] rustc_use_parallel_compiler = ['rustc_driver/rustc_use_parallel_compiler']

4
compiler/rustc/src/main.rs
View File

@ -22,12 +22,10 @@
// The two crates we link to here, `std` and `rustc_driver`, are both dynamic // The two crates we link to here, `std` and `rustc_driver`, are both dynamic
// libraries. So we must reference jemalloc symbols one way or another, because // libraries. So we must reference jemalloc symbols one way or another, because
// this file is the only object code in the rustc executable. // this file is the only object code in the rustc executable.
#[cfg(feature = "tikv-jemalloc-sys")]
use tikv_jemalloc_sys as jemalloc_sys;
fn main() { fn main() {
// See the comment at the top of this file for an explanation of this. // See the comment at the top of this file for an explanation of this.
#[cfg(feature = "tikv-jemalloc-sys")] #[cfg(feature = "jemalloc-sys")]
{ {
use std::os::raw::{c_int, c_void}; use std::os::raw::{c_int, c_void};

4
src/librustdoc/lib.rs
View File

@ -70,9 +70,7 @@ extern crate test;
// See docs in https://github.com/rust-lang/rust/blob/master/compiler/rustc/src/main.rs // See docs in https://github.com/rust-lang/rust/blob/master/compiler/rustc/src/main.rs
// about jemalloc. // about jemalloc.
#[cfg(feature = "jemalloc")] #[cfg(feature = "jemalloc")]
extern crate tikv_jemalloc_sys; extern crate jemalloc_sys;
#[cfg(feature = "jemalloc")]
use tikv_jemalloc_sys as jemalloc_sys;
use std::default::Default; use std::default::Default;
use std::env::{self, VarError}; use std::env::{self, VarError};