diff options
| author | bors <bors@rust-lang.org> | 2018-12-14 06:52:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-14 06:52:19 +0000 |
| commit | 664ede88faf57b8fc09715fc66cd9e46490ce64d (patch) | |
| tree | a3e57a948123750226a0fed966826221420039c2 /src/libstd/lib.rs | |
| parent | 97a0bd60820374165427962e9802f4f3c3f7ff7b (diff) | |
| parent | cf47a19305d929d1870414dd6911ca3191597668 (diff) | |
| download | rust-664ede88faf57b8fc09715fc66cd9e46490ce64d.tar.gz rust-664ede88faf57b8fc09715fc66cd9e46490ce64d.zip | |
Auto merge of #56536 - alexcrichton:update-master, r=Mark-Simulacrum
Bump to 1.33.0 * Update bootstrap compiler * Update version to 1.33.0 * Remove some `#[cfg(stage0)]` annotations
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 90c8eaf0f7c..7c43ba5afa7 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -317,10 +317,6 @@ #![default_lib_allocator] -#[cfg(stage0)] -#[global_allocator] -static ALLOC: alloc::System = alloc::System; - // Explicitly import the prelude. The compiler uses this same unstable attribute // to import the prelude implicitly when building crates that depend on std. #[prelude_import] |