subtree-push nightly-2026-06-10

[ytmimi]

Bumping the toolchain version as part of a git subtree push

current toolchain (nightly-2026-02-19):

• 1.95.0-nightly (c04308580 2026-02-18)

latest toolchain (nightly-2026-06-10):

• 1.98.0-nightly (beae78130 2026-06-09)

Note

This PR also reverts #6839 because it was leading to test failures in CI. It's unclear to me right now why thats the case, but we need to reopen #5364 once this is merged.

[ytmimi]

Diff-Check --edition=2021 --style-edition=2021 Failed ❌: All diffs tie back to r-l/r changes

Diff Explanation

Change due to 61b29c1 (rust-lang/rust#156815)

2026-06-11T12:54:22.294630Z ERROR check_diff: Diff found in 'rust' when formatting rust/library/coretests/tests/hint.rs
--- original
+++ modified
@@ -5,7 +5,7 @@
     use core::cell::Cell;
     struct X<'a>(&'a Cell<bool>);
-    impl const Drop for X<'_> {
+    const impl Drop for X<'_> {
         fn drop(&mut self) {
             self.0.set(true);
         }

Change due to ebebf24 (rust-lang/rust#153445)

2026-06-11T12:54:22.295093Z ERROR check_diff: Diff found in 'miri' when formatting miri/src/shims/time.rs
--- original
+++ modified
@@ -472,19 +472,17 @@
         let nsec_field = this.project_field_named(tp, "tv_nsec")?;
         let nsec = this.read_scalar(&nsec_field)?.to_int(nsec_field.layout.size)?;
-        interp_ok(
-            try {
-                // tv_sec must be non-negative.
-                let seconds: u64 = sec.try_into().ok()?;
-                // tv_nsec must be non-negative.
-                let nanoseconds: u32 = nsec.try_into().ok()?;
-                if nanoseconds >= 1_000_000_000 {
-                    // tv_nsec must not be greater than 999,999,999.
-                    None?
-                }
-                Duration::new(seconds, nanoseconds)
-            },
-        )
+        interp_ok(try {
+            // tv_sec must be non-negative.
+            let seconds: u64 = sec.try_into().ok()?;
+            // tv_nsec must be non-negative.
+            let nanoseconds: u32 = nsec.try_into().ok()?;
+            if nanoseconds >= 1_000_000_000 {
+                // tv_nsec must not be greater than 999,999,999.
+                None?
+            }
+            Duration::new(seconds, nanoseconds)
+        })
     }

[ytmimi]

Diff-Check --edition=2021 --style-edition=2024 Failed ❌: All diffs tie back to r-l/r changes. Same diff as above

[ytmimi]

Diff-Check --edition=2024 --style-edition=2021 Failed ❌: All diffs tie back to r-l/r changes. Same diff as above

[ytmimi]

Diff-Check --edition=2024 --style-edition=2024 Failed ❌: All diffs tie back to r-l/r changes. Same diff as above

[ytmimi]

Although the diff check failed, it was due to merging r-l/r changes back into rustfmt. All of these changes have been available on nightly for a while and only impact unstable features #![feature(try_blocks)] #![feature(try_blocks_heterogeneous)], and #![feature(const_trait_impl)]. I'm Pretty confident we can merge these changes without introducing breaking formatting changes.