mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #89898 - Amanieu:remove_alloc_prelude, r=joshtriplett

Browse source 
Remove alloc::prelude

As per the libs team decision in #58935.

Closes #58935
This commit is contained in:
Matthias Krüger 2021-10-16 08:02:21 +02:00 • committed by GitHub
commit dfed1a6c07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_cranelift/example/alloc_example.rs
View file

@ -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] #![no_std]
extern crate alloc; extern crate alloc;
extern crate alloc_system; extern crate alloc_system;
use alloc::prelude::v1::*; use alloc::boxed::Box;
use alloc_system::System; use alloc_system::System;

4
compiler/rustc_codegen_gcc/example/alloc_example.rs
View file

@ -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] #![no_std]
extern crate alloc; extern crate alloc;
extern crate alloc_system; extern crate alloc_system;
use alloc::prelude::v1::*; use alloc::boxed::Box;
use alloc_system::System; use alloc_system::System;

1
library/alloc/src/lib.rs
View file

@ -189,7 +189,6 @@ mod boxed {
pub mod borrow; pub mod borrow;
pub mod collections; pub mod collections;
pub mod fmt; pub mod fmt;
pub mod prelude;
pub mod raw_vec; pub mod raw_vec;
pub mod rc; pub mod rc;
pub mod slice; pub mod slice;

15
library/alloc/src/prelude/mod.rs
View file

@ -1,15 +0,0 @@
//! The alloc Prelude
//!
//! The purpose of this module is to alleviate imports of commonly-used
//! items of the `alloc` crate by adding a glob import to the top of modules:
//!
//! ```
//! # #![allow(unused_imports)]
//! #![feature(alloc_prelude)]
//! extern crate alloc;
//! use alloc::prelude::v1::*;
//! ```
#![unstable(feature = "alloc_prelude", issue = "58935")]
pub mod v1;

14
library/alloc/src/prelude/v1.rs
View file

@ -1,14 +0,0 @@
//! The first version of the prelude of `alloc` crate.
//!
//! See the [module-level documentation](../index.html) for more.
#![unstable(feature = "alloc_prelude", issue = "58935")]
#[unstable(feature = "alloc_prelude", issue = "58935")]
pub use crate::borrow::ToOwned;
#[unstable(feature = "alloc_prelude", issue = "58935")]
pub use crate::boxed::Box;
#[unstable(feature = "alloc_prelude", issue = "58935")]
pub use crate::string::{String, ToString};
#[unstable(feature = "alloc_prelude", issue = "58935")]
pub use crate::vec::Vec;