diff options
| author | bors <bors@rust-lang.org> | 2018-06-12 00:36:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-12 00:36:21 +0000 |
| commit | 4367e41ea2a105c373de27c2f080fc2527cc6927 (patch) | |
| tree | 9ca30ec2dbf3311f0a0d0d6275d5abca8f23fc1f /src/test/compile-fail/allocator/function-allocator.rs | |
| parent | f9944fde377b8b2575f96fff60f784eddce54002 (diff) | |
| parent | 7f0d54d98842c786ab7a140c17c3ea32aea6aead (diff) | |
| download | rust-4367e41ea2a105c373de27c2f080fc2527cc6927.tar.gz rust-4367e41ea2a105c373de27c2f080fc2527cc6927.zip | |
Auto merge of #51241 - glandium:globalalloc, r=sfackler,SimonSapin
Stabilize GlobalAlloc and #[global_allocator] This PR implements the changes discussed in https://github.com/rust-lang/rust/issues/49668#issuecomment-393263510 Fixes #49668 Fixes #27389 This does not change the default global allocator: #36963
Diffstat (limited to 'src/test/compile-fail/allocator/function-allocator.rs')
| -rw-r--r-- | src/test/compile-fail/allocator/function-allocator.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/test/compile-fail/allocator/function-allocator.rs b/src/test/compile-fail/allocator/function-allocator.rs index 50f82607b53..989c102b86e 100644 --- a/src/test/compile-fail/allocator/function-allocator.rs +++ b/src/test/compile-fail/allocator/function-allocator.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(global_allocator)] #[global_allocator] fn foo() {} //~ ERROR: allocators must be statics |