Skip to content

Commit 28ab0a2

Browse files
github-actions[bot]The Miri Cronjob BotZalatharGnurouKobzol
authored
Merge subtree update for toolchain nightly-2025-09-09 (#488)
This is an automated PR to merge library subtree updates from 2025-08-26 (rust-lang/rust@54c5812) to 2025-09-09 (rust-lang/rust@9c27f27) (inclusive) into main. `git merge` resulted in conflicts, which require manual resolution. Files were commited with merge conflict markers. **Do not remove or edit the following annotations:** git-subtree-dir: library git-subtree-split: 83da666 --------- Signed-off-by: Connor Tsui <[email protected]> Co-authored-by: The Miri Cronjob Bot <[email protected]> Co-authored-by: Stuart Cook <[email protected]> Co-authored-by: Alexandre Courbot <[email protected]> Co-authored-by: Jakub Beránek <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: binarycat <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Tsukasa OI <[email protected]> Co-authored-by: Ralf Jung <[email protected]> Co-authored-by: Michael Rieder <[email protected]> Co-authored-by: 许杰友 Jieyou Xu (Joe) <[email protected]> Co-authored-by: Tobias Bucher <[email protected]> Co-authored-by: Lorenz Leutgeb <[email protected]> Co-authored-by: Josh Triplett <[email protected]> Co-authored-by: Trevor Gross <[email protected]> Co-authored-by: Folkert de Vries <[email protected]> Co-authored-by: Quinn Tucker <[email protected]> Co-authored-by: Stefan Schindler <[email protected]> Co-authored-by: Jacob Pratt <[email protected]> Co-authored-by: Scott McMurray <[email protected]> Co-authored-by: clubby789 <[email protected]> Co-authored-by: 王宇逸 <[email protected]> Co-authored-by: Tuomas Tajakka <[email protected]> Co-authored-by: Josh Stone <[email protected]> Co-authored-by: ltdk <[email protected]> Co-authored-by: Karl Meakin <[email protected]> Co-authored-by: Aapo Alasuutari <[email protected]> Co-authored-by: Karol Zwolak <[email protected]> Co-authored-by: Pascal S. de Kloe <[email protected]> Co-authored-by: okaneco <[email protected]> Co-authored-by: Connor Tsui <[email protected]> Co-authored-by: ivmarkov <[email protected]> Co-authored-by: Havard Eidnes <[email protected]> Co-authored-by: Samuel Tardieu <[email protected]> Co-authored-by: Ada Alakbarova <[email protected]> Co-authored-by: Urgau <[email protected]> Co-authored-by: Marijn Schouten <[email protected]> Co-authored-by: Rafael RL <[email protected]> Co-authored-by: Paul Murphy <[email protected]> Co-authored-by: Elias Holzmann <[email protected]> Co-authored-by: Marijn Schouten <[email protected]> Co-authored-by: Guillaume Gomez <[email protected]> Co-authored-by: Tobias Stoeckmann <[email protected]> Co-authored-by: Nathan Collins <[email protected]> Co-authored-by: Matthias Krüger <[email protected]> Co-authored-by: WANG Rui <[email protected]> Co-authored-by: Alice Ryhl <[email protected]> Co-authored-by: Pavel Grigorenko <[email protected]> Co-authored-by: Nilotpal Gupta <[email protected]> Co-authored-by: Waffle Lapkin <[email protected]> Co-authored-by: gonzalobg <[email protected]> Co-authored-by: neeko-cat <[email protected]> Co-authored-by: Alex Crichton <[email protected]> Co-authored-by: Jeremy Smart <[email protected]> Co-authored-by: Matthew Maurer <[email protected]> Co-authored-by: joboet <[email protected]> Co-authored-by: actuallylost <[email protected]> Co-authored-by: omanirudh <[email protected]> Co-authored-by: Trevor Gross <[email protected]> Co-authored-by: Chai T. Rex <[email protected]> Co-authored-by: Connor Tsui <[email protected]> Co-authored-by: Aurelia Molzer <[email protected]> Co-authored-by: Vladimir Petrzhikovskii <[email protected]> Co-authored-by: Chris Denton <[email protected]> Co-authored-by: LorrensP-2158466 <[email protected]> Co-authored-by: Nathaniel McCallum <[email protected]> Co-authored-by: AudaciousAxiom <[email protected]> Co-authored-by: Bart Jacobs <[email protected]> Co-authored-by: sayantn <[email protected]> Co-authored-by: Romain Perier <[email protected]> Co-authored-by: Niklas Fiekas <[email protected]> Co-authored-by: bendn <[email protected]> Co-authored-by: Jules Bertholet <[email protected]> Co-authored-by: Mads Marquart <[email protected]> Co-authored-by: León Orell Valerian Liehr <[email protected]> Co-authored-by: Weihang Lo <[email protected]> Co-authored-by: Soroush Mirzaei <[email protected]> Co-authored-by: Justin Yao Du <[email protected]> Co-authored-by: gitbot <git@bot> Co-authored-by: github-merge-queue <[email protected]> Co-authored-by: Michael Tautschnig <[email protected]> Co-authored-by: Felipe R. Monteiro <[email protected]>
1 parent b007ef7 commit 28ab0a2

File tree

235 files changed

+6741
-3479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+6741
-3479
lines changed

.github/workflows/flux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
FIXPOINT_VERSION: "556104ba5508891c357b0bdf819ce706e93d9349"
12-
FLUX_VERSION: "b0cec81c42bc6e210f675b46dd5b4b16774b0d0e"
12+
FLUX_VERSION: "f5e57bec353e2eb3550d2b7ba086462264dfa290"
1313

1414
jobs:
1515
check-flux-on-core:

.github/workflows/kani.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ jobs:
198198
--include-pattern time::Duration::from_micros \
199199
--include-pattern time::Duration::from_millis \
200200
--include-pattern time::Duration::from_nanos \
201+
--exclude-pattern time::Duration::from_nanos_u128 \
201202
--include-pattern time::Duration::from_secs \
202203
--exclude-pattern time::Duration::from_secs_f \
203204
--include-pattern unicode::unicode_data::conversions::to_ \

library/Cargo.lock

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library/alloc/src/borrow.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ use crate::fmt;
1717
use crate::string::String;
1818

1919
#[stable(feature = "rust1", since = "1.0.0")]
20-
impl<'a, B: ?Sized> Borrow<B> for Cow<'a, B>
20+
#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
21+
impl<'a, B: ?Sized> const Borrow<B> for Cow<'a, B>
2122
where
2223
B: ToOwned,
24+
B::Owned: [const] Borrow<B>,
2325
{
2426
fn borrow(&self) -> &B {
2527
&**self
@@ -326,9 +328,10 @@ impl<B: ?Sized + ToOwned> Cow<'_, B> {
326328
}
327329

328330
#[stable(feature = "rust1", since = "1.0.0")]
329-
impl<B: ?Sized + ToOwned> Deref for Cow<'_, B>
331+
#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
332+
impl<B: ?Sized + ToOwned> const Deref for Cow<'_, B>
330333
where
331-
B::Owned: Borrow<B>,
334+
B::Owned: [const] Borrow<B>,
332335
{
333336
type Target = B;
334337

@@ -439,7 +442,11 @@ where
439442
}
440443

441444
#[stable(feature = "rust1", since = "1.0.0")]
442-
impl<T: ?Sized + ToOwned> AsRef<T> for Cow<'_, T> {
445+
#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
446+
impl<T: ?Sized + ToOwned> const AsRef<T> for Cow<'_, T>
447+
where
448+
T::Owned: [const] Borrow<T>,
449+
{
443450
fn as_ref(&self) -> &T {
444451
self
445452
}

library/alloc/src/boxed.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,11 +2128,6 @@ impl<F: ?Sized + Future + Unpin, A: Allocator> Future for Box<F, A> {
21282128

21292129
#[stable(feature = "box_error", since = "1.8.0")]
21302130
impl<E: Error> Error for Box<E> {
2131-
#[allow(deprecated, deprecated_in_future)]
2132-
fn description(&self) -> &str {
2133-
Error::description(&**self)
2134-
}
2135-
21362131
#[allow(deprecated)]
21372132
fn cause(&self) -> Option<&dyn Error> {
21382133
Error::cause(&**self)

library/alloc/src/boxed/convert.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,12 +608,7 @@ impl<'a> From<String> for Box<dyn Error + Send + Sync + 'a> {
608608
fn from(err: String) -> Box<dyn Error + Send + Sync + 'a> {
609609
struct StringError(String);
610610

611-
impl Error for StringError {
612-
#[allow(deprecated)]
613-
fn description(&self) -> &str {
614-
&self.0
615-
}
616-
}
611+
impl Error for StringError {}
617612

618613
impl fmt::Display for StringError {
619614
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

library/alloc/src/collections/btree/map/entry.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,6 @@ impl<'a, K: Debug + Ord, V: Debug, A: Allocator + Clone> fmt::Display
136136
impl<'a, K: core::fmt::Debug + Ord, V: core::fmt::Debug> core::error::Error
137137
for crate::collections::btree_map::OccupiedError<'a, K, V>
138138
{
139-
#[allow(deprecated)]
140-
fn description(&self) -> &str {
141-
"key already exists"
142-
}
143139
}
144140

145141
impl<'a, K: Ord, V, A: Allocator + Clone> Entry<'a, K, V, A> {

library/alloc/src/collections/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,19 @@ pub use realalloc::collections::TryReserveErrorKind;
128128
reason = "Uncertain how much info should be exposed",
129129
issue = "48043"
130130
)]
131+
#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
131132
#[cfg(not(test))]
132-
impl From<TryReserveErrorKind> for TryReserveError {
133+
impl const From<TryReserveErrorKind> for TryReserveError {
133134
#[inline]
134135
fn from(kind: TryReserveErrorKind) -> Self {
135136
Self { kind }
136137
}
137138
}
138139

139140
#[unstable(feature = "try_reserve_kind", reason = "new API", issue = "48043")]
141+
#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
140142
#[cfg(not(test))]
141-
impl From<LayoutError> for TryReserveErrorKind {
143+
impl const From<LayoutError> for TryReserveErrorKind {
142144
/// Always evaluates to [`TryReserveErrorKind::CapacityOverflow`].
143145
#[inline]
144146
fn from(_: LayoutError) -> Self {

library/alloc/src/ffi/c_str.rs

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,17 +1061,10 @@ impl IntoStringError {
10611061
}
10621062
}
10631063

1064-
impl IntoStringError {
1065-
fn description(&self) -> &str {
1066-
"C string contained non-utf8 bytes"
1067-
}
1068-
}
1069-
10701064
#[stable(feature = "cstring_into", since = "1.7.0")]
10711065
impl fmt::Display for IntoStringError {
1072-
#[allow(deprecated, deprecated_in_future)]
10731066
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
1074-
self.description().fmt(f)
1067+
"C string contained non-utf8 bytes".fmt(f)
10751068
}
10761069
}
10771070

@@ -1291,23 +1284,13 @@ impl PartialEq<CString> for Cow<'_, CStr> {
12911284
}
12921285

12931286
#[stable(feature = "rust1", since = "1.0.0")]
1294-
impl core::error::Error for NulError {
1295-
#[allow(deprecated)]
1296-
fn description(&self) -> &str {
1297-
"nul byte found in data"
1298-
}
1299-
}
1287+
impl core::error::Error for NulError {}
13001288

13011289
#[stable(feature = "cstring_from_vec_with_nul", since = "1.58.0")]
13021290
impl core::error::Error for FromVecWithNulError {}
13031291

13041292
#[stable(feature = "cstring_into", since = "1.7.0")]
13051293
impl core::error::Error for IntoStringError {
1306-
#[allow(deprecated)]
1307-
fn description(&self) -> &str {
1308-
"C string contained non-utf8 bytes"
1309-
}
1310-
13111294
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
13121295
Some(&self.error)
13131296
}

library/alloc/src/fmt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
//! sign := '+' | '-'
355355
//! width := count
356356
//! precision := count | '*'
357-
//! type := '?' | 'x?' | 'X?' | identifier
357+
//! type := '?' | 'x?' | 'X?' | 'o' | 'x' | 'X' | 'p' | 'b' | 'e' | 'E'
358358
//! count := parameter | integer
359359
//! parameter := argument '$'
360360
//! ```

0 commit comments

Comments
 (0)