diff options
| author | bors <bors@rust-lang.org> | 2018-10-19 09:29:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-19 09:29:48 +0000 |
| commit | 74ff7dcb1388e60a613cd6050bcd372a3cc4998b (patch) | |
| tree | 4b035c9be0ee57066b2427b5d98794887b4f6e75 /src/liballoc | |
| parent | dbab381da1a46a18e46a04a61156aec40c59a4f6 (diff) | |
| parent | 0724efd9a1aac9cf4620795786fb8e896fbb17b3 (diff) | |
| download | rust-74ff7dcb1388e60a613cd6050bcd372a3cc4998b.tar.gz rust-74ff7dcb1388e60a613cd6050bcd372a3cc4998b.zip | |
Auto merge of #55194 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests Successful merges: - #54300 (Updated RELEASES.md for 1.30.0) - #55013 ([NLL] Propagate bounds from generators) - #55071 (Fix ICE and report a human readable error) - #55144 (Cleanup resolve) - #55166 (Don't warn about parentheses on `match (return)`) - #55169 (Add a `copysign` function to f32 and f64) - #55178 (Stabilize slice::chunks_exact(), chunks_exact_mut(), rchunks(), rchunks_mut(), rchunks_exact(), rchunks_exact_mut())
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/slice.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/tests/lib.rs | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 0cad471d9a1..84ca7c4fec9 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -115,12 +115,10 @@ #![feature(unsize)] #![feature(allocator_internals)] #![feature(on_unimplemented)] -#![feature(chunks_exact)] #![feature(rustc_const_unstable)] #![feature(const_vec_new)] #![feature(slice_partition_dedup)] #![feature(maybe_uninit)] -#![feature(rchunks)] // Allow testing this library diff --git a/src/liballoc/slice.rs b/src/liballoc/slice.rs index 2628757b503..1eaff7410ea 100644 --- a/src/liballoc/slice.rs +++ b/src/liballoc/slice.rs @@ -123,9 +123,9 @@ pub use core::slice::{from_raw_parts, from_raw_parts_mut}; pub use core::slice::{from_ref, from_mut}; #[stable(feature = "slice_get_slice", since = "1.28.0")] pub use core::slice::SliceIndex; -#[unstable(feature = "chunks_exact", issue = "47115")] +#[stable(feature = "chunks_exact", since = "1.31.0")] pub use core::slice::{ChunksExact, ChunksExactMut}; -#[unstable(feature = "rchunks", issue = "55177")] +#[stable(feature = "rchunks", since = "1.31.0")] pub use core::slice::{RChunks, RChunksMut, RChunksExact, RChunksExactMut}; //////////////////////////////////////////////////////////////////////////////// diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs index 62c84c9e086..6d1cfb10859 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -19,8 +19,6 @@ #![feature(str_escape)] #![feature(try_reserve)] #![feature(unboxed_closures)] -#![feature(chunks_exact)] -#![feature(rchunks)] #![feature(repeat_generic_slice)] extern crate alloc_system; |