From 03d1f24db8a7501a6975ce4387ad9fa5063a4894 Mon Sep 17 00:00:00 2001 From: mbartlett21 <29034492+mbartlett21@users.noreply.github.com> Date: Fri, 5 Nov 2021 15:44:43 +1000 Subject: [PATCH 1/4] Re-export `core::slice::SplitInclusive[Mut]` --- library/alloc/src/slice.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/alloc/src/slice.rs b/library/alloc/src/slice.rs index 860f21085f3..37bc07688d5 100644 --- a/library/alloc/src/slice.rs +++ b/library/alloc/src/slice.rs @@ -130,6 +130,8 @@ pub use core::slice::{RChunks, RChunksExact, RChunksExactMut, RChunksMut}; pub use core::slice::{RSplit, RSplitMut}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{RSplitN, RSplitNMut, SplitN, SplitNMut}; +#[stable(feature = "split_inclusive", since = "1.51.0")] +pub use core::slice::{SplitInclusive, SplitInclusiveMut}; //////////////////////////////////////////////////////////////////////////////// // Basic slice extension methods From 9ae92ad19acc7f9e3da2d88f22a877ab3eebe13d Mon Sep 17 00:00:00 2001 From: mbartlett21 <29034492+mbartlett21@users.noreply.github.com> Date: Fri, 5 Nov 2021 17:14:57 +1000 Subject: [PATCH 2/4] Re-export `core::slice::EscapeAscii` --- library/alloc/src/slice.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/alloc/src/slice.rs b/library/alloc/src/slice.rs index 37bc07688d5..ae730be0d25 100644 --- a/library/alloc/src/slice.rs +++ b/library/alloc/src/slice.rs @@ -108,6 +108,8 @@ pub use core::slice::ArrayChunks; pub use core::slice::ArrayChunksMut; #[unstable(feature = "array_windows", issue = "75027")] pub use core::slice::ArrayWindows; +#[unstable(feature = "inherent_ascii_escape", issue = "77174")] +pub use core::slice::EscapeAscii; #[stable(feature = "slice_get_slice", since = "1.28.0")] pub use core::slice::SliceIndex; #[stable(feature = "from_ref", since = "1.28.0")] From d606dbe25604f4faeed193498858f9af50ea3d9c Mon Sep 17 00:00:00 2001 From: mbartlett21 <29034492+mbartlett21@users.noreply.github.com> Date: Fri, 5 Nov 2021 17:35:07 +1000 Subject: [PATCH 3/4] Add feature to `alloc` so we can re-export. --- library/alloc/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index 34d2cfc8e2c..5dda7bfa37c 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -104,6 +104,7 @@ #![feature(extend_one)] #![feature(fmt_internals)] #![feature(fn_traits)] +#![feature(inherent_ascii_escape)] #![feature(inplace_iteration)] #![feature(iter_advance_by)] #![feature(iter_zip)] From ed63c71d61f2e9e5d8f54a78149117e596dddf0f Mon Sep 17 00:00:00 2001 From: mbartlett21 <29034492+mbartlett21@users.noreply.github.com> Date: Fri, 5 Nov 2021 17:46:58 +1000 Subject: [PATCH 4/4] Fix `str::SplitInclusive` stabilisation date --- library/alloc/src/str.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/alloc/src/str.rs b/library/alloc/src/str.rs index 3b875477df3..104f5556566 100644 --- a/library/alloc/src/str.rs +++ b/library/alloc/src/str.rs @@ -46,7 +46,7 @@ pub use core::str::pattern; pub use core::str::EncodeUtf16; #[stable(feature = "split_ascii_whitespace", since = "1.34.0")] pub use core::str::SplitAsciiWhitespace; -#[stable(feature = "split_inclusive", since = "1.53.0")] +#[stable(feature = "split_inclusive", since = "1.51.0")] pub use core::str::SplitInclusive; #[stable(feature = "rust1", since = "1.0.0")] pub use core::str::SplitWhitespace;