Rollup merge of rust-lang#89898 - Amanieu:remove_alloc_prelude, r=jos…

…htriplett Remove alloc::prelude As per the libs team decision in rust-lang#58935. Closes rust-lang#58935
matthiaskrgr · Oct 15, 2021 · 774ab62 · 774ab62
2 parents 16bdcdb + 8007dfa
commit 774ab62
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 34 deletions.
diff --git a/compiler/rustc_codegen_cranelift/example/alloc_example.rs b/compiler/rustc_codegen_cranelift/example/alloc_example.rs
@@ -1,10 +1,10 @@
-#![feature(start, core_intrinsics, alloc_prelude, alloc_error_handler, box_syntax)]
+#![feature(start, core_intrinsics, alloc_error_handler, box_syntax)]
 #![no_std]
 
 extern crate alloc;
 extern crate alloc_system;
 
-use alloc::prelude::v1::*;
+use alloc::boxed::Box;
 
 use alloc_system::System;
 

diff --git a/compiler/rustc_codegen_gcc/example/alloc_example.rs b/compiler/rustc_codegen_gcc/example/alloc_example.rs
@@ -1,10 +1,10 @@
-#![feature(start, box_syntax, core_intrinsics, alloc_prelude, alloc_error_handler)]
+#![feature(start, box_syntax, core_intrinsics, alloc_error_handler)]
 #![no_std]
 
 extern crate alloc;
 extern crate alloc_system;
 
-use alloc::prelude::v1::*;
+use alloc::boxed::Box;
 
 use alloc_system::System;
 

diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs
@@ -189,7 +189,6 @@ mod boxed {
 pub mod borrow;
 pub mod collections;
 pub mod fmt;
-pub mod prelude;
 pub mod raw_vec;
 pub mod rc;
 pub mod slice;

diff --git a/library/alloc/src/prelude/mod.rs b/library/alloc/src/prelude/mod.rs
diff --git a/library/alloc/src/prelude/v1.rs b/library/alloc/src/prelude/v1.rs