Skip to content

Commit b4f59e8

Browse files
github-actions[bot]Natural-selection1Urgaumatthiaskrgrbend-n
authored
Merge subtree update for toolchain nightly-2025-05-22 (#364)
This is an automated PR to merge library subtree updates from 2025-05-20 (rust-lang/rust@60dabef) to 2025-05-22 (rust-lang/rust@bf64d66) (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: 02d9329 --------- Signed-off-by: Ayush Singh <[email protected]> Signed-off-by: Sean Cross <[email protected]> Signed-off-by: Vladimir Krivopalov <[email protected]> Signed-off-by: xizheyin <[email protected]> Co-authored-by: Hegui Dai <[email protected]> Co-authored-by: Urgau <[email protected]> Co-authored-by: Matthias Krüger <[email protected]> Co-authored-by: bendn <[email protected]> Co-authored-by: Ralf Jung <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Trevor Gross <[email protected]> Co-authored-by: The Miri Cronjob Bot <[email protected]> Co-authored-by: ismailarilik <[email protected]> Co-authored-by: Tobias <[email protected]> Co-authored-by: Ethan Wu <[email protected]> Co-authored-by: Ayush Singh <[email protected]> Co-authored-by: Jake Goulding <[email protected]> Co-authored-by: Michael Howell <[email protected]> Co-authored-by: Christopher Durham <[email protected]> Co-authored-by: Pavel Grigorenko <[email protected]> Co-authored-by: LemonJ <[email protected]> Co-authored-by: SabrinaJewson <[email protected]> Co-authored-by: Nicholas Nethercote <[email protected]> Co-authored-by: Chris Denton <[email protected]> Co-authored-by: joboet <[email protected]> Co-authored-by: Andrew Zhogin <[email protected]> Co-authored-by: DaniPopes <[email protected]> Co-authored-by: Lieselotte <[email protected]> Co-authored-by: Sean Cross <[email protected]> Co-authored-by: Trevor Gross <[email protected]> Co-authored-by: Jon Bauman <[email protected]> Co-authored-by: binarycat <[email protected]> Co-authored-by: Mara Bos <[email protected]> Co-authored-by: Mathis B <[email protected]> Co-authored-by: Zachary S <[email protected]> Co-authored-by: Thalia Archibald <[email protected]> Co-authored-by: Amanieu d'Antras <[email protected]> Co-authored-by: sayantn <[email protected]> Co-authored-by: Artur Roos <[email protected]> Co-authored-by: Eyal Kalderon <[email protected]> Co-authored-by: Guillaume Gomez <[email protected]> Co-authored-by: Lynnesbian <[email protected]> Co-authored-by: Christopher Berner <[email protected]> Co-authored-by: Stuart Cook <[email protected]> Co-authored-by: Paolo Barbolini <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: The 8472 <[email protected]> Co-authored-by: Nick Kocharhook <[email protected]> Co-authored-by: Vladimir Krivopalov <[email protected]> Co-authored-by: Vilim Lendvaj <[email protected]> Co-authored-by: David Tolnay <[email protected]> Co-authored-by: Marijn Schouten <[email protected]> Co-authored-by: Jacob Pratt <[email protected]> Co-authored-by: 王宇逸 <[email protected]> Co-authored-by: ivmarkov <[email protected]> Co-authored-by: Martin Kröning <[email protected]> Co-authored-by: Daniel Paoliello <[email protected]> Co-authored-by: Luca Versari <[email protected]> Co-authored-by: xizheyin <[email protected]> Co-authored-by: Ben Kimock <[email protected]> Co-authored-by: Dietrich Daroch <[email protected]> Co-authored-by: León Orell Valerian Liehr <[email protected]> Co-authored-by: Pietro Albini <[email protected]> Co-authored-by: Julian Knodt <[email protected]> Co-authored-by: Michael Goulet <[email protected]> Co-authored-by: Michał Łowicki <[email protected]> Co-authored-by: Samuel Tardieu <[email protected]> Co-authored-by: B I Mohammed Abbas <[email protected]> Co-authored-by: Federico Terzi <[email protected]> Co-authored-by: sam skeoch <[email protected]> Co-authored-by: est31 <[email protected]> Co-authored-by: Fluid <[email protected]> Co-authored-by: Speedy_Lex <[email protected]> Co-authored-by: Mario Pastorelli <[email protected]> Co-authored-by: Daniel McNab <[email protected]> Co-authored-by: Josh Triplett <[email protected]> Co-authored-by: gitbot <git@bot> Co-authored-by: Michael Tautschnig <[email protected]>
1 parent afb5c2c commit b4f59e8

File tree

23 files changed

+1493
-1291
lines changed

23 files changed

+1493
-1291
lines changed

library/alloc/src/str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl str {
234234
#[stable(feature = "str_box_extras", since = "1.20.0")]
235235
#[must_use = "`self` will be dropped if the result is not used"]
236236
#[inline]
237-
pub fn into_boxed_bytes(self: Box<str>) -> Box<[u8]> {
237+
pub fn into_boxed_bytes(self: Box<Self>) -> Box<[u8]> {
238238
self.into()
239239
}
240240

@@ -501,7 +501,7 @@ impl str {
501501
#[rustc_allow_incoherent_impl]
502502
#[must_use = "`self` will be dropped if the result is not used"]
503503
#[inline]
504-
pub fn into_string(self: Box<str>) -> String {
504+
pub fn into_string(self: Box<Self>) -> String {
505505
let slice = Box::<[u8]>::from(self);
506506
unsafe { String::from_utf8_unchecked(slice.into_vec()) }
507507
}

library/core/src/intrinsics/mod.rs

Lines changed: 78 additions & 339 deletions
Large diffs are not rendered by default.

library/core/src/mem/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ mod transmutability;
2323
#[unstable(feature = "transmutability", issue = "99571")]
2424
pub use transmutability::{Assume, TransmuteFrom};
2525

26+
// This one has to be a re-export (rather than wrapping the underlying intrinsic) so that we can do
27+
// the special magic "types have equal size" check at the call site.
2628
#[stable(feature = "rust1", since = "1.0.0")]
2729
#[doc(inline)]
2830
pub use crate::intrinsics::transmute;

0 commit comments

Comments
 (0)