diff options
| author | bors <bors@rust-lang.org> | 2019-04-13 22:24:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-13 22:24:33 +0000 |
| commit | 00856722bad5e9d96048319fb41f4b7e249820cd (patch) | |
| tree | 9c813b5a9ac58b59d765a510e2f03c84446b6962 /src/liballoc | |
| parent | e4c66afba5d69356879570aeff22db5a38566a86 (diff) | |
| parent | cf370b40dc9955ed3cff90f94b96507513ad6ded (diff) | |
Auto merge of #59949 - Centril:rollup-lsiqq1g, r=Centril
Rollup of 16 pull requests
Successful merges:
- #59675 (Stabilize the `alloc` crate.)
- #59708 (Mark variables captured by reference as mutable correctly)
- #59735 (remove lookup_char_pos_adj)
- #59747 (Copy book.toml unstable book generator)
- #59796 (Retire `IsNotConst` naming)
- #59804 (Clean up jobserver integration)
- #59818 (Eliminate `FnBox` usages from libstd.)
- #59830 (Fix links on keyword docs.)
- #59835 (Re-export NonZero signed variant in std)
- #59852 (std: Add `{read,write}_vectored` for more types)
- #59855 (Fix attributes position in type declaration)
- #59858 (Make duplicate matcher bindings a hard error)
- #59899 (In `-Zprint-type-size` output, sort enum variants by size.)
- #59912 (MaybeUninit: remove deprecated functions)
- #59925 (Fix paste error in split_ascii_whitespace docs.)
- #59930 (Exclude some copies of old book editions from search engines)
Failed merges:
r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 5 | ||||
| -rw-r--r-- | src/liballoc/prelude/mod.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/raw_vec.rs | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 9064b4ccd6a..7f3acc933d4 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -51,10 +51,7 @@ //! default global allocator. It is not compatible with the libc allocator API. #![allow(unused_attributes)] -#![unstable(feature = "alloc", - reason = "this library is unlikely to be stabilized in its current \ - form or name", - issue = "27783")] +#![stable(feature = "alloc", since = "1.36.0")] #![doc(html_root_url = "https://doc.rust-lang.org/nightly/", issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/", test(no_crate_inject, attr(allow(unused_variables), deny(warnings))))] diff --git a/src/liballoc/prelude/mod.rs b/src/liballoc/prelude/mod.rs index 33cc51d1732..0534ad3edc7 100644 --- a/src/liballoc/prelude/mod.rs +++ b/src/liballoc/prelude/mod.rs @@ -5,7 +5,6 @@ //! //! ``` //! # #![allow(unused_imports)] -//! # #![feature(alloc)] //! #![feature(alloc_prelude)] //! extern crate alloc; //! use alloc::prelude::v1::*; diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index fe28fe5095c..d1fc5ac3b30 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -256,7 +256,7 @@ impl<T, A: Alloc> RawVec<T, A> { /// # Examples /// /// ``` - /// # #![feature(alloc, raw_vec_internals)] + /// # #![feature(raw_vec_internals)] /// # extern crate alloc; /// # use std::ptr; /// # use alloc::raw_vec::RawVec; @@ -460,7 +460,7 @@ impl<T, A: Alloc> RawVec<T, A> { /// # Examples /// /// ``` - /// # #![feature(alloc, raw_vec_internals)] + /// # #![feature(raw_vec_internals)] /// # extern crate alloc; /// # use std::ptr; /// # use alloc::raw_vec::RawVec; |
