Skip to content

Commit d22dd65

Browse files
committed
Auto merge of #90604 - mbartlett21:iterator-reexports, r=kennytm
Re-export some iterators from `core` in `std` These iterators seem to have been forgotten to be re-exported from `std` (through `alloc`) These are stable: `core::slice::{SplitInclusive, SplitInclusiveMut}` This one is still unstable: `core::slice::EscapeAscii` (cc #77174)
2 parents 489ec31 + ed63c71 commit d22dd65

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

library/alloc/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
#![feature(extend_one)]
105105
#![feature(fmt_internals)]
106106
#![feature(fn_traits)]
107+
#![feature(inherent_ascii_escape)]
107108
#![feature(inplace_iteration)]
108109
#![feature(iter_advance_by)]
109110
#![feature(iter_zip)]

library/alloc/src/slice.rs

+4
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ pub use core::slice::ArrayChunks;
108108
pub use core::slice::ArrayChunksMut;
109109
#[unstable(feature = "array_windows", issue = "75027")]
110110
pub use core::slice::ArrayWindows;
111+
#[unstable(feature = "inherent_ascii_escape", issue = "77174")]
112+
pub use core::slice::EscapeAscii;
111113
#[stable(feature = "slice_get_slice", since = "1.28.0")]
112114
pub use core::slice::SliceIndex;
113115
#[stable(feature = "from_ref", since = "1.28.0")]
@@ -130,6 +132,8 @@ pub use core::slice::{RChunks, RChunksExact, RChunksExactMut, RChunksMut};
130132
pub use core::slice::{RSplit, RSplitMut};
131133
#[stable(feature = "rust1", since = "1.0.0")]
132134
pub use core::slice::{RSplitN, RSplitNMut, SplitN, SplitNMut};
135+
#[stable(feature = "split_inclusive", since = "1.51.0")]
136+
pub use core::slice::{SplitInclusive, SplitInclusiveMut};
133137

134138
////////////////////////////////////////////////////////////////////////////////
135139
// Basic slice extension methods

library/alloc/src/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub use core::str::pattern;
4646
pub use core::str::EncodeUtf16;
4747
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
4848
pub use core::str::SplitAsciiWhitespace;
49-
#[stable(feature = "split_inclusive", since = "1.53.0")]
49+
#[stable(feature = "split_inclusive", since = "1.51.0")]
5050
pub use core::str::SplitInclusive;
5151
#[stable(feature = "rust1", since = "1.0.0")]
5252
pub use core::str::SplitWhitespace;

0 commit comments

Comments
 (0)