Auto merge of #3704 - rust-lang:rustup-2024-06-23, r=RalfJung

Automatic Rustup

Author: bors

rust-version

@@ -1 +1 @@
-7a08f84627ff3035de4d66ff3209e5fc93165dcb
+acb62737aca7045f331e7a05adc38bed213e278d

src/alloc_bytes.rs

@@ -112,4 +112,8 @@ impl AllocBytes for MiriAllocBytes {
     fn as_mut_ptr(&mut self) -> *mut u8 {
         self.ptr
     }
+
+    fn as_ptr(&self) -> *const u8 {
+        self.ptr
+    }
 }

src/concurrency/thread.rs

@@ -643,8 +643,7 @@ impl<'tcx> ThreadManager<'tcx> {
         if !self.threads[joined_thread_id].state.is_terminated() {
             trace!(
                 "{:?} blocked on {:?} when trying to join",
-                self.active_thread,
-                joined_thread_id
+                self.active_thread, joined_thread_id
             );
             // The joined thread is still running, we need to wait for it.
             // Unce we get unblocked, perform the appropriate synchronization.

tests/fail/intrinsic_fallback_is_spec.rs

@@ -1,4 +1,4 @@
-#![feature(rustc_attrs, effects)]
+#![feature(rustc_attrs)]
 
 #[rustc_intrinsic]
 #[rustc_nounwind]