Skip to content

Commit a84d6a3

Browse files
authored
Rollup merge of rust-lang#89898 - Amanieu:remove_alloc_prelude, r=joshtriplett
Remove alloc::prelude As per the libs team decision in rust-lang#58935. Closes rust-lang#58935
2 parents 38d2699 + 8007dfa commit a84d6a3

File tree

5 files changed

+4
-34
lines changed

5 files changed

+4
-34
lines changed

compiler/rustc_codegen_cranelift/example/alloc_example.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#![feature(start, core_intrinsics, alloc_prelude, alloc_error_handler, box_syntax)]
1+
#![feature(start, core_intrinsics, alloc_error_handler, box_syntax)]
22
#![no_std]
33

44
extern crate alloc;
55
extern crate alloc_system;
66

7-
use alloc::prelude::v1::*;
7+
use alloc::boxed::Box;
88

99
use alloc_system::System;
1010

compiler/rustc_codegen_gcc/example/alloc_example.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#![feature(start, box_syntax, core_intrinsics, alloc_prelude, alloc_error_handler)]
1+
#![feature(start, box_syntax, core_intrinsics, alloc_error_handler)]
22
#![no_std]
33

44
extern crate alloc;
55
extern crate alloc_system;
66

7-
use alloc::prelude::v1::*;
7+
use alloc::boxed::Box;
88

99
use alloc_system::System;
1010

library/alloc/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ mod boxed {
189189
pub mod borrow;
190190
pub mod collections;
191191
pub mod fmt;
192-
pub mod prelude;
193192
pub mod raw_vec;
194193
pub mod rc;
195194
pub mod slice;

library/alloc/src/prelude/mod.rs

-15
This file was deleted.

library/alloc/src/prelude/v1.rs

-14
This file was deleted.

0 commit comments

Comments
 (0)