diff options
| author | bors <bors@rust-lang.org> | 2018-06-02 21:32:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-02 21:32:47 +0000 |
| commit | 3515dab431702f3a926f61f52cd0743d95e4fd3f (patch) | |
| tree | 97e5055aa0c78209a5c490e0c02c65cab27ed4de /src/liballoc | |
| parent | 4ecf12bf0eb8386626ccdb5f721a7183ccc4eba6 (diff) | |
| parent | dcfe311da8ce43941d5788531216d8f142626628 (diff) | |
| download | rust-3515dab431702f3a926f61f52cd0743d95e4fd3f.tar.gz rust-3515dab431702f3a926f61f52cd0743d95e4fd3f.zip | |
Auto merge of #51310 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 6 pull requests
Successful merges:
- #50167 ( Add as_nanos function to Duration)
- #50919 (Provide more context for what the {f32,f64}::EPSILON values represent.)
- #51124 (Reword {ptr,mem}::replace docs.)
- #51147 (Stabilize SliceIndex trait.)
- #51291 (Fix typos of ‘ambiguous’)
- #51302 (Permit building rustdoc without compiler artifacts)
Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/slice.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 91de3ad0c39..a56420d52d0 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -104,7 +104,6 @@ #![feature(ptr_internals)] #![feature(ptr_offset_from)] #![feature(rustc_attrs)] -#![feature(slice_get_slice)] #![feature(specialization)] #![feature(staged_api)] #![feature(str_internals)] diff --git a/src/liballoc/slice.rs b/src/liballoc/slice.rs index 90bc2f9769c..c27c596e797 100644 --- a/src/liballoc/slice.rs +++ b/src/liballoc/slice.rs @@ -121,7 +121,7 @@ pub use core::slice::{RSplit, RSplitMut}; pub use core::slice::{from_raw_parts, from_raw_parts_mut}; #[stable(feature = "from_ref", since = "1.28.0")] pub use core::slice::{from_ref, from_mut}; -#[unstable(feature = "slice_get_slice", issue = "35729")] +#[stable(feature = "slice_get_slice", since = "1.28.0")] pub use core::slice::SliceIndex; #[unstable(feature = "exact_chunks", issue = "47115")] pub use core::slice::{ExactChunks, ExactChunksMut}; |