Merge pull request #4656 from rust-lang/rustup-2025-10-30

Automatic Rustup

Author: RalfJung

.github/workflows/ci.yml

@@ -31,7 +31,8 @@ jobs:
             os: ubuntu-24.04-arm
             multiarch: armhf
             gcc_cross: arm-linux-gnueabihf
-          # Disabled due to Ubuntu repo trouble
+          # Ubuntu mirrors are not reliable enough for these architectures
+          # (see <https://bugs.launchpad.net/ubuntu/+bug/2130309>).
           # - host_target: riscv64gc-unknown-linux-gnu
           #   os: ubuntu-latest
           #   multiarch: riscv64
@@ -68,7 +69,7 @@ jobs:
       - name: install multiarch
         if: ${{ matrix.multiarch != '' }}
         run: |
-          # s390x, ppc64el, riscv64 need Ubuntu Ports to be in the mirror list
+          # armhf, s390x, ppc64el, riscv64 need Ubuntu Ports to be in the mirror list
           sudo bash -c "echo 'https://ports.ubuntu.com/	priority:4' >> /etc/apt/apt-mirrors.txt"
           # Add architecture
           sudo dpkg --add-architecture ${{ matrix.multiarch }}

rust-version

@@ -1 +1 @@
-27050c0d15af664cf43ce4b0badec230e0bfcac5
+292be5c7c05138d753bbd4b30db7a3f1a5c914f7

src/clock.rs

@@ -46,21 +46,7 @@ impl Instant {
                 InstantKind::Virtual { nanoseconds: earlier },
             ) => {
                 let duration = nanoseconds.saturating_sub(earlier);
-                cfg_select! {
-                    bootstrap => {
-                         // `Duration` does not provide a nice constructor from a `u128` of nanoseconds,
-                        // so we have to implement this ourselves.
-                        // It is possible for second to overflow because u64::MAX < (u128::MAX / 1e9).
-                        // It will be saturated to u64::MAX seconds if the value after division exceeds u64::MAX.
-                        let seconds = u64::try_from(duration / 1_000_000_000).unwrap_or(u64::MAX);
-                        // It is impossible for nanosecond to overflow because u32::MAX > 1e9.
-                        let nanosecond = u32::try_from(duration.wrapping_rem(1_000_000_000)).unwrap();
-                        Duration::new(seconds, nanosecond)
-                    }
-                    _ => {
-                        Duration::from_nanos_u128(duration)
-                    }
-                }
+                Duration::from_nanos_u128(duration)
             }
             _ => panic!("all `Instant` must be of the same kind"),
         }

src/lib.rs

@@ -17,7 +17,7 @@
 #![feature(derive_coerce_pointee)]
 #![feature(arbitrary_self_types)]
 #![feature(iter_advance_by)]
-#![cfg_attr(not(bootstrap), feature(duration_from_nanos_u128))]
+#![feature(duration_from_nanos_u128)]
 // Configure clippy and other lints
 #![allow(
     clippy::collapsible_else_if,