diff options
| author | bors <bors@rust-lang.org> | 2024-05-02 09:21:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-02 09:21:43 +0000 |
| commit | f5efc3c286a8e625f7932f9e6f52e5812a4b67fc (patch) | |
| tree | 20dddafe47e427c6419b05f3e3c8ec3d658f938a /library/alloc/src | |
| parent | fcc06c894b17f4d0c80b8934ea5f27faa894c960 (diff) | |
| parent | 44988e25770e87949e282f606dee702906bd2eed (diff) | |
| download | rust-f5efc3c286a8e625f7932f9e6f52e5812a4b67fc.tar.gz rust-f5efc3c286a8e625f7932f9e6f52e5812a4b67fc.zip | |
Auto merge of #124521 - Mark-Simulacrum:bootstrap-bump, r=albertlarsan68
Bump bootstrap compiler to latest beta https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday This also cherry-picks d716d72586548963f32e5c8d57c41db0065fa6e0 from the beta branching, to continue to workaround #122758. r? bootstrap
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/lib.rs | 4 | ||||
| -rw-r--r-- | library/alloc/src/str.rs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index 4e8792f6fb9..b93936869b3 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -165,9 +165,6 @@ // // Language features: // tidy-alphabetical-start -#![cfg_attr(bootstrap, feature(associated_type_bounds))] -#![cfg_attr(bootstrap, feature(inline_const))] -#![cfg_attr(not(bootstrap), rustc_preserve_ub_checks)] #![cfg_attr(not(test), feature(coroutine_trait))] #![cfg_attr(test, feature(panic_update_hook))] #![cfg_attr(test, feature(test))] @@ -198,6 +195,7 @@ #![feature(unboxed_closures)] #![feature(unsized_fn_params)] #![feature(with_negative_coherence)] +#![rustc_preserve_ub_checks] // tidy-alphabetical-end // // Rustdoc features: diff --git a/library/alloc/src/str.rs b/library/alloc/src/str.rs index d88639c4092..c0d292cd208 100644 --- a/library/alloc/src/str.rs +++ b/library/alloc/src/str.rs @@ -53,7 +53,7 @@ pub use core::str::{RSplit, Split}; pub use core::str::{RSplitN, SplitN}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::str::{RSplitTerminator, SplitTerminator}; -#[stable(feature = "utf8_chunks", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "utf8_chunks", since = "1.79.0")] pub use core::str::{Utf8Chunk, Utf8Chunks}; /// Note: `str` in `Concat<str>` is not meaningful here. |