diff options
| author | bors <bors@rust-lang.org> | 2018-04-07 09:30:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-07 09:30:10 +0000 |
| commit | 04fef17143daad88bdc4314561e9c2eb5a364805 (patch) | |
| tree | b0bb324507ef843489202811b72d01947bd68c78 /src/liballoc_jemalloc | |
| parent | e0a9bd0f3cfd20694ff62ac8b74747adcdbbfa99 (diff) | |
| parent | 24b3a979860efad7a69a432c0f1bcbf35b8bbab7 (diff) | |
| download | rust-04fef17143daad88bdc4314561e9c2eb5a364805.tar.gz rust-04fef17143daad88bdc4314561e9c2eb5a364805.zip | |
Auto merge of #49753 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests Successful merges: - #49510 (Fix anchor position on fields) - #49652 (Fix anchors issue when everything is collapsed) - #49702 (std: Inline some Termination-related methods) - #49728 (add emit_debug_gdb_scripts target option and ..) - #49731 (add THUMB targets to rustup manifest) - #49742 (Using X headings instead of 0.X #49739) - #49748 (proc_macro: Improve Debug representations) - #49750 (bootstrap: Remove the fast path) - #49503 (Inject the `compiler_builtins` crate whenever the `core` crate is injected) Failed merges:
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/Cargo.toml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc_jemalloc/Cargo.toml b/src/liballoc_jemalloc/Cargo.toml index 6d7d83dd993..fd4a4553046 100644 --- a/src/liballoc_jemalloc/Cargo.toml +++ b/src/liballoc_jemalloc/Cargo.toml @@ -16,6 +16,7 @@ alloc = { path = "../liballoc" } alloc_system = { path = "../liballoc_system" } core = { path = "../libcore" } libc = { path = "../rustc/libc_shim" } +compiler_builtins = { path = "../rustc/compiler_builtins_shim" } [build-dependencies] build_helper = { path = "../build_helper" } |