diff options
| author | bors <bors@rust-lang.org> | 2018-04-14 13:11:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-14 13:11:24 +0000 |
| commit | 21dae950bebab7376d2bcb92299861e6cd05299d (patch) | |
| tree | 321aff4a41151ac452434bec0483b2a15b5f58c3 /src/test/compile-fail/allocator | |
| parent | cfc3465b9d3eac25c0511fd5e99c9f342a494411 (diff) | |
| parent | 0e9d6f9bb0ed675c82c30ca6a3227731f2facf6a (diff) | |
| download | rust-21dae950bebab7376d2bcb92299861e6cd05299d.tar.gz rust-21dae950bebab7376d2bcb92299861e6cd05299d.zip | |
Auto merge of #49939 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests Successful merges: #49908, #49876, #49916, #49951, #49465, #49922, #49866, #49915, #49886, #49913, #49852, #49958, #49871, #49864 Failed merges:
Diffstat (limited to 'src/test/compile-fail/allocator')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/compile-fail/allocator/auxiliary/system-allocator.rs b/src/test/compile-fail/allocator/auxiliary/system-allocator.rs index 4761dc421d7..37e64ba7ea1 100644 --- a/src/test/compile-fail/allocator/auxiliary/system-allocator.rs +++ b/src/test/compile-fail/allocator/auxiliary/system-allocator.rs @@ -13,7 +13,7 @@ #![feature(global_allocator, allocator_api)] #![crate_type = "rlib"] -use std::heap::System; +use std::alloc::System; #[global_allocator] static A: System = System; diff --git a/src/test/compile-fail/allocator/auxiliary/system-allocator2.rs b/src/test/compile-fail/allocator/auxiliary/system-allocator2.rs index 4761dc421d7..37e64ba7ea1 100644 --- a/src/test/compile-fail/allocator/auxiliary/system-allocator2.rs +++ b/src/test/compile-fail/allocator/auxiliary/system-allocator2.rs @@ -13,7 +13,7 @@ #![feature(global_allocator, allocator_api)] #![crate_type = "rlib"] -use std::heap::System; +use std::alloc::System; #[global_allocator] static A: System = System; diff --git a/src/test/compile-fail/allocator/two-allocators.rs b/src/test/compile-fail/allocator/two-allocators.rs index b46ba6334a2..5aa6b5d6777 100644 --- a/src/test/compile-fail/allocator/two-allocators.rs +++ b/src/test/compile-fail/allocator/two-allocators.rs @@ -10,7 +10,7 @@ #![feature(global_allocator, allocator_api)] -use std::heap::System; +use std::alloc::System; #[global_allocator] static A: System = System; diff --git a/src/test/compile-fail/allocator/two-allocators2.rs b/src/test/compile-fail/allocator/two-allocators2.rs index e342c1f9c44..ec5d985a943 100644 --- a/src/test/compile-fail/allocator/two-allocators2.rs +++ b/src/test/compile-fail/allocator/two-allocators2.rs @@ -16,7 +16,7 @@ extern crate system_allocator; -use std::heap::System; +use std::alloc::System; #[global_allocator] static A: System = System; |