diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-03 08:27:44 +0100 |
|---|---|---|
| committer | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-03 08:27:44 +0100 |
| commit | 2396780cdaedf097dd6a8f3927749bcaf5b1238b (patch) | |
| tree | 297f6254da34163ba06af6a5186b80b2fd9b4fa7 /src/liballoc/alloc.rs | |
| parent | 285106a40e70cd5b240625749e4eac8fce96fcf9 (diff) | |
| download | rust-2396780cdaedf097dd6a8f3927749bcaf5b1238b.tar.gz rust-2396780cdaedf097dd6a8f3927749bcaf5b1238b.zip | |
liballoc: revert nested imports style changes.
Diffstat (limited to 'src/liballoc/alloc.rs')
| -rw-r--r-- | src/liballoc/alloc.rs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index 515de9852d1..ec652df3b37 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -2,11 +2,9 @@ #![stable(feature = "alloc_module", since = "1.28.0")] -use core::{ - intrinsics::{min_align_of_val, size_of_val}, - ptr::{NonNull, Unique}, - usize, -}; +use core::intrinsics::{min_align_of_val, size_of_val}; +use core::ptr::{NonNull, Unique}; +use core::usize; #[stable(feature = "alloc_module", since = "1.28.0")] #[doc(inline)] @@ -230,10 +228,8 @@ pub fn handle_alloc_error(layout: Layout) -> ! { mod tests { extern crate test; use test::Bencher; - use crate::{ - boxed::Box, - alloc::{Global, Alloc, Layout, handle_alloc_error}, - }; + use crate::boxed::Box; + use crate::alloc::{Global, Alloc, Layout, handle_alloc_error}; #[test] fn allocate_zeroed() { |