diff options
| author | bors <bors@rust-lang.org> | 2018-05-22 16:38:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-22 16:38:12 +0000 |
| commit | e0635188ed30e083245482218a0de9237f14ce90 (patch) | |
| tree | 4975803176a0a9a8e040d30f83ac41ecf489b5a0 /src/liballoc | |
| parent | 9f80ea32811db0bdbd05b1bef59f5db26b3e24a9 (diff) | |
| parent | 0c4d337c3c4bf6ec0878f98251f4d1a1482cf56c (diff) | |
| download | rust-e0635188ed30e083245482218a0de9237f14ce90.tar.gz rust-e0635188ed30e083245482218a0de9237f14ce90.zip | |
Auto merge of #50968 - kennytm:rollup, r=kennytm
Rollup of 15 pull requests Successful merges: - #50846 (Add E0665) - #50849 (CheckLoopVisitor: also visit closure arguments) - #50863 (Make `[T]::len` and `str::len` const fn) - #50875 (rustdoc: use "short form" doc(cfg) printing even when combined with other conditionals) - #50913 (Fix typo in cell.rs) - #50914 (Issue #50636: Improve error diagnostic with missing commas after struct fields.) - #50931 (Inline `try_get`.) - #50932 (Optimize seen Predicate filtering.) - #50945 (Stabilize feature from_ref) - #50946 (rustc: Fix procedural macros generating lifetime tokens) - #50947 (rustdoc: set tab width in rust source blocks) - #50952 (Add the 2018 edition of the book to doc.rust-lang.org) - #50958 (Micro-optimization on PR#50697) - #50961 (Fix FileCheck finding with MSVC) - #50963 (Right-size the `VecDeque` in `coerce_unsized`.) Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/slice.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/slice.rs b/src/liballoc/slice.rs index 4427ac004f9..161493f3892 100644 --- a/src/liballoc/slice.rs +++ b/src/liballoc/slice.rs @@ -119,8 +119,8 @@ pub use core::slice::{SplitN, RSplitN, SplitNMut, RSplitNMut}; pub use core::slice::{RSplit, RSplitMut}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{from_raw_parts, from_raw_parts_mut}; -#[unstable(feature = "from_ref", issue = "45703")] -pub use core::slice::{from_ref, from_ref_mut}; +#[stable(feature = "from_ref", since = "1.28.0")] +pub use core::slice::{from_ref, from_mut}; #[unstable(feature = "slice_get_slice", issue = "35729")] pub use core::slice::SliceIndex; #[unstable(feature = "exact_chunks", issue = "47115")] |