about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-03-26 20:07:29 +0000
committerbors <bors@rust-lang.org>2021-03-26 20:07:29 +0000
commit4f27db6956dbd50bb3ce92a73e344d1d02bb1a63 (patch)
treeb1957f5dc2c226a87e668c6147ca7e4d0e19f1a1
parent6a1077d47f3c87dd98f881fc456a05a4c39874bc (diff)
parent309177703bacde27938a253f795cf6db7c83498b (diff)
Auto merge of #83516 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] backports

Initial round of beta backports, with 1 PR:

* SplitInclusive is public API #83372

This also includes a bump to the released stable compiler.

r? `@Mark-Simulacrum`
-rw-r--r--library/core/src/str/mod.rs2
-rw-r--r--src/stage0.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/library/core/src/str/mod.rs b/library/core/src/str/mod.rs
index 50ccc2a2eab..67c074b3943 100644
--- a/library/core/src/str/mod.rs
+++ b/library/core/src/str/mod.rs
@@ -66,7 +66,7 @@ pub use iter::{EscapeDebug, EscapeDefault, EscapeUnicode};
 pub use iter::SplitAsciiWhitespace;
 
 #[stable(feature = "split_inclusive", since = "1.51.0")]
-use iter::SplitInclusive;
+pub use iter::SplitInclusive;
 
 #[unstable(feature = "str_internals", issue = "none")]
 pub use validations::next_code_point;
diff --git a/src/stage0.txt b/src/stage0.txt
index 89a65788d34..22c2799673e 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -12,7 +12,7 @@
 # stable release's version number. `date` is the date where the release we're
 # bootstrapping off was released.
 
-date: 2021-03-23
+date: 2021-03-25
 rustc: 1.51.0
 
 # We use a nightly rustfmt to format the source because it solves some
@@ -39,4 +39,4 @@ rustc: 1.51.0
 # looking at a beta source tarball and it's uncommented we'll shortly comment it
 # out.
 
-dev: 1
+#dev: 1