diff options
| author | bors <bors@rust-lang.org> | 2018-08-09 19:05:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-09 19:05:14 +0000 |
| commit | 8958ed672298148841b3b8d6371ce301e1cbbac1 (patch) | |
| tree | 7f51966483dbc2f13ef51cb6c244f11c8a31dd52 /src/liballoc_jemalloc | |
| parent | b73535f1e9c46a698527fab51b1cc9fad3f53412 (diff) | |
| parent | 9f55705a24fa3a9f3977f1f95bc37143b2d857a0 (diff) | |
| download | rust-8958ed672298148841b3b8d6371ce301e1cbbac1.tar.gz rust-8958ed672298148841b3b8d6371ce301e1cbbac1.zip | |
Auto merge of #53216 - kennytm:rollup, r=kennytm
Rollup of 15 pull requests
Successful merges:
- #52773 (Avoid unnecessary pattern matching against Option and Result)
- #53082 (Fix doc link (again))
- #53094 (Automatically expand section if url id point to one of its component)
- #53106 (atomic ordering docs)
- #53110 (Account for --remap-path-prefix in save-analysis)
- #53116 (NetBSD: fix signedess of char)
- #53179 (Whitelist wasm32 simd128 target feature)
- #53183 (Suggest comma when missing in macro call)
- #53207 (Add individual docs for rotate_{left, right})
- #53211 ([nll] enable feature(nll) on various crates for bootstrap)
- #53214 ([nll] enable feature(nll) on various crates for bootstrap: part 2)
- #53215 (Slightly refactor syntax_ext/format)
- #53217 (inline some short functions)
- #53219 ([nll] enable feature(nll) on various crates for bootstrap: part 3)
- #53222 (A few cleanups for rustc_target)
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index b3b20715511..480a24b9bd1 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -16,6 +16,7 @@ #![feature(core_intrinsics)] #![feature(libc)] #![feature(linkage)] +#![cfg_attr(not(stage0), feature(nll))] #![feature(staged_api)] #![feature(rustc_attrs)] #![cfg_attr(dummy_jemalloc, allow(dead_code, unused_extern_crates))] |