Rustup

rust-version

@@ -1 +1 @@
-c656540d6467dee1381f0cbd882412d6bd1cd5ae
+9bb55c8c865411b7d9dea6ff743e583d510d89f5

src/lib.rs

@@ -14,7 +14,7 @@
 #![feature(float_gamma)]
 #![feature(float_erf)]
 #![feature(map_try_insert)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
 #![feature(try_blocks)]
 #![feature(io_error_more)]
 #![feature(io_error_inprogress)]
@@ -201,7 +201,4 @@ pub const MIRI_DEFAULT_ARGS: &[&str] = &[
     // Deduplicating diagnostics means we miss events when tracking what happens during an
     // execution. Let's not do that.
     "-Zdeduplicate-diagnostics=no",
-    // FIXME(#160895): the new solver is enabled by default on nightly, but we
-    // don't want to use it in Miri for now. Remove once that's reverted.
-    "-Znext-solver=coherence",
 ];

src/shims/unix/foreign_items.rs

@@ -1358,7 +1358,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
                 // This function looks and behaves exactly like miri_start_unwind.
                 let [payload] = this.check_shim_sig(
-                    shim_sig!(extern "C" fn(*_) -> unwind::_Unwind_Reason_Code),
+                    // Look up the return type via `panic_unwind::`, not via `unwind::`, as
+                    // the latter it not always unique.
+                    shim_sig!(extern "C" fn(*_) -> panic_unwind::imp::uw::_Unwind_Reason_Code),
                     (link_name, abi, args),
                 )?;
                 this.handle_miri_start_unwind(payload)?;

src/shims/windows/foreign_items.rs

@@ -1178,7 +1178,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 }
                 // This function looks and behaves exactly like miri_start_unwind.
                 let [payload] = this.check_shim_sig(
-                    shim_sig!(extern "C" fn(*_) -> unwind::_Unwind_Reason_Code),
+                    // Look up the return type via `panic_unwind::`, not via `unwind::`, as
+                    // the latter it not always unique.
+                    shim_sig!(extern "C" fn(*_) -> panic_unwind::imp::uw::_Unwind_Reason_Code),
                     (link_name, abi, args),
                 )?;
                 this.handle_miri_start_unwind(payload)?;

tests/fail/dangling_pointers/dangling_pointer_deref_match_never.rs

@@ -2,7 +2,6 @@
 //@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 #![allow(unreachable_code)]
-#![feature(never_type)]
 
 fn main() {
     let p = {

tests/fail/erroneous_const.rs

@@ -1,6 +1,5 @@
 //! Make sure we detect erroneous constants post-monomorphization even when they are unused.
 //! (https://github.com/rust-lang/miri/issues/1382)
-#![feature(never_type)]
 
 struct PrintName<T>(T);
 impl<T> PrintName<T> {

tests/fail/intrinsics/uninit_uninhabited_type.rs

@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
 #[allow(deprecated, invalid_value)]
 fn main() {
     let _ = unsafe { std::mem::uninitialized::<!>() }; //~ERROR: constructing invalid value

tests/fail/match/closures/uninhabited-variant1.rs

@@ -1,6 +1,5 @@
 // Motivated by rust-lang/rust#138961, this shows how invalid discriminants interact with
 // closure captures.
-#![feature(never_type)]
 
 #[repr(C)]
 #[allow(dead_code)]

tests/fail/match/closures/uninhabited-variant2.rs

@@ -3,7 +3,6 @@
 //
 // Test case with only one inhabited variant, for which rustc used to not emit
 // a discriminant read in the first place. See: rust-lang/miri#4778
-#![feature(never_type)]
 
 #[repr(C)]
 #[allow(dead_code)]

tests/fail/match/only_inhabited_variant.rs

@@ -1,5 +1,4 @@
 // rust-lang/miri#4778
-#![feature(never_type)]
 
 #[repr(C)]
 #[allow(dead_code)]

tests/fail/never_match_never.rs

@@ -1,7 +1,6 @@
 // This should fail even without validation
 //@compile-flags: -Zmiri-disable-validation
 
-#![feature(never_type)]
 #![allow(unreachable_code)]
 
 fn main() {

tests/fail/never_say_never.rs

@@ -1,7 +1,6 @@
 // This should fail even without validation
 //@compile-flags: -Zmiri-disable-validation
 
-#![feature(never_type)]
 #![allow(unreachable_code)]
 
 fn main() {

tests/fail/never_transmute_humans.rs

@@ -1,8 +1,6 @@
 // This should fail even without validation
 //@compile-flags: -Zmiri-disable-validation
 
-#![feature(never_type)]
-
 struct Human;
 
 fn main() {

tests/fail/never_transmute_void.rs

@@ -1,7 +1,6 @@
 // This should fail even without validation
 //@compile-flags: -Zmiri-disable-validation
 
-#![feature(never_type)]
 #![allow(unused, invalid_value)]
 
 mod m {

tests/fail/stacked_borrows/drop_in_place_retag.rs

@@ -3,6 +3,8 @@
 
 //@error-in-other-file: /retag .* for Unique permission .* only grants SharedReadOnly permission/
 
+#![allow(dropping_copy_types)]
+
 fn main() {
     unsafe {
         let x = 0u8;

tests/fail/validity/invalid_enum_op_discr_uninhabited.rs

@@ -1,6 +1,5 @@
 // Make sure we find these even with many checks disabled.
 //@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
-#![feature(never_type)]
 
 enum Never {}
 

tests/fail/validity/ref_to_uninhabited1.rs

@@ -1,4 +1,3 @@
-#![feature(never_type)]
 use std::mem::{forget, transmute};
 
 fn main() {

tests/fail/validity/uninhabited_variant.rs

@@ -1,6 +1,5 @@
 // NOTE: this is essentially a smoke-test, with more comprehensive tests living in the rustc
 // repository at tests/ui/consts/const-eval/ub-enum.rs
-#![feature(never_type)]
 
 #[repr(C)]
 #[allow(dead_code)]

tests/pass/async-fn.rs

@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
 use std::future::Future;
 
 // See if we can run a basic `async fn`

tests/pass/coroutine.rs

@@ -1,7 +1,7 @@
 //@revisions: stack tree tree_implicit_writes
 //@[tree_implicit_writes]compile-flags: -Zmiri-tree-borrows -Zmiri-tree-borrows-implicit-writes
 //@[tree]compile-flags: -Zmiri-tree-borrows
-#![feature(coroutines, coroutine_trait, never_type, stmt_expr_attributes)]
+#![feature(coroutines, coroutine_trait, stmt_expr_attributes)]
 
 use std::fmt::Debug;
 use std::mem::ManuallyDrop;

tests/pass/drop_in_place.rs

@@ -2,6 +2,8 @@
 // valid when dropped. This test confirms that behavior.
 // This is not a stable guarantee!
 
+#![allow(dropping_copy_types)]
+
 use std::ptr;
 
 fn main() {

tests/pass/function_calls/abi_compat.rs

@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
 use std::rc::Rc;
 use std::{mem, num, ptr};
 

tests/pass/issues/issue-120337-irrefutable-let-ice.rs

@@ -1,7 +1,6 @@
 // Validation stops the test before the ICE we used to hit
 //@compile-flags: -Zmiri-disable-validation
 
-#![feature(never_type)]
 #[derive(Copy, Clone)]
 pub enum E {
     A(!),

tests/pass/loop-break-value.rs

@@ -1,4 +1,3 @@
-#![feature(never_type)]
 #![allow(unreachable_code)]
 
 #[allow(unused)]

tests/pass/panic/catch_panic.rs

@@ -1,4 +1,3 @@
-#![feature(never_type)]
 #![allow(unconditional_panic, non_fmt_panics)]
 
 use std::cell::Cell;

tests/pass/underscore_pattern.rs

@@ -1,5 +1,4 @@
 // Various tests ensuring that underscore patterns really just construct the place, but don't check its contents.
-#![feature(never_type)]
 
 use std::ptr;