Use min_exhaustive_patterns in core & std

Nadrieril · Nadrieril · commit 9962a01e9f5d · 2024-03-12T08:20:46.000+01:00
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs
@@ -203,8 +203,10 @@
 // Language features:
 // tidy-alphabetical-start
 #![cfg_attr(bootstrap, feature(diagnostic_namespace))]
+#![cfg_attr(bootstrap, feature(exhaustive_patterns))]
 #![cfg_attr(bootstrap, feature(platform_intrinsics))]
 #![cfg_attr(not(bootstrap), feature(freeze_impls))]
+#![cfg_attr(not(bootstrap), feature(min_exhaustive_patterns))]
 #![feature(abi_unadjusted)]
 #![feature(adt_const_params)]
 #![feature(allow_internal_unsafe)]
@@ -229,7 +231,6 @@
 #![feature(doc_cfg_hide)]
 #![feature(doc_notable_trait)]
 #![feature(effects)]
-#![feature(exhaustive_patterns)]
 #![feature(extern_types)]
 #![feature(fundamental)]
 #![feature(generic_arg_infer)]
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
@@ -270,7 +270,9 @@
 //
 // Language features:
 // tidy-alphabetical-start
+#![cfg_attr(bootstrap, feature(exhaustive_patterns))]
 #![cfg_attr(bootstrap, feature(platform_intrinsics))]
+#![cfg_attr(not(bootstrap), feature(min_exhaustive_patterns))]
 #![feature(alloc_error_handler)]
 #![feature(allocator_internals)]
 #![feature(allow_internal_unsafe)]
@@ -289,7 +291,6 @@
 #![feature(doc_masked)]
 #![feature(doc_notable_trait)]
 #![feature(dropck_eyepatch)]
-#![feature(exhaustive_patterns)]
 #![feature(if_let_guard)]
 #![feature(intra_doc_pointers)]
 #![feature(lang_items)]
diff --git a/library/std/src/sync/poison.rs b/library/std/src/sync/poison.rs
@@ -270,6 +270,8 @@ impl<T> fmt::Debug for TryLockError<T> {
         match *self {
             #[cfg(panic = "unwind")]
             TryLockError::Poisoned(..) => "Poisoned(..)".fmt(f),
+            #[cfg(not(panic = "unwind"))]
+            TryLockError::Poisoned(ref p) => match p._never {},
             TryLockError::WouldBlock => "WouldBlock".fmt(f),
         }
     }
@@ -281,6 +283,8 @@ impl<T> fmt::Display for TryLockError<T> {
         match *self {
             #[cfg(panic = "unwind")]
             TryLockError::Poisoned(..) => "poisoned lock: another task failed inside",
+            #[cfg(not(panic = "unwind"))]
+            TryLockError::Poisoned(ref p) => match p._never {},
             TryLockError::WouldBlock => "try_lock failed because the operation would block",
         }
         .fmt(f)
@@ -294,6 +298,8 @@ impl<T> Error for TryLockError<T> {
         match *self {
             #[cfg(panic = "unwind")]
             TryLockError::Poisoned(ref p) => p.description(),
+            #[cfg(not(panic = "unwind"))]
+            TryLockError::Poisoned(ref p) => match p._never {},
             TryLockError::WouldBlock => "try_lock failed because the operation would block",
         }
     }
@@ -303,6 +309,8 @@ impl<T> Error for TryLockError<T> {
         match *self {
             #[cfg(panic = "unwind")]
             TryLockError::Poisoned(ref p) => Some(p),
+            #[cfg(not(panic = "unwind"))]
+            TryLockError::Poisoned(ref p) => match p._never {},
             _ => None,
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,8 @@ impl<T> fmt::Debug for TryLockError<T> {`
`270`	`270`	`match *self {`
`271`	`271`	`#[cfg(panic = "unwind")]`
`272`	`272`	`TryLockError::Poisoned(..) => "Poisoned(..)".fmt(f),`
	`273`	`+ #[cfg(not(panic = "unwind"))]`
	`274`	`+ TryLockError::Poisoned(ref p) => match p._never {},`
`273`	`275`	`TryLockError::WouldBlock => "WouldBlock".fmt(f),`
`274`	`276`	`}`
`275`	`277`	`}`
`@@ -281,6 +283,8 @@ impl<T> fmt::Display for TryLockError<T> {`
`281`	`283`	`match *self {`
`282`	`284`	`#[cfg(panic = "unwind")]`
`283`	`285`	`TryLockError::Poisoned(..) => "poisoned lock: another task failed inside",`
	`286`	`+ #[cfg(not(panic = "unwind"))]`
	`287`	`+ TryLockError::Poisoned(ref p) => match p._never {},`
`284`	`288`	`TryLockError::WouldBlock => "try_lock failed because the operation would block",`
`285`	`289`	`}`
`286`	`290`	`.fmt(f)`
`@@ -294,6 +298,8 @@ impl<T> Error for TryLockError<T> {`
`294`	`298`	`match *self {`
`295`	`299`	`#[cfg(panic = "unwind")]`
`296`	`300`	`TryLockError::Poisoned(ref p) => p.description(),`
	`301`	`+ #[cfg(not(panic = "unwind"))]`
	`302`	`+ TryLockError::Poisoned(ref p) => match p._never {},`
`297`	`303`	`TryLockError::WouldBlock => "try_lock failed because the operation would block",`
`298`	`304`	`}`
`299`	`305`	`}`
`@@ -303,6 +309,8 @@ impl<T> Error for TryLockError<T> {`
`303`	`309`	`match *self {`
`304`	`310`	`#[cfg(panic = "unwind")]`
`305`	`311`	`TryLockError::Poisoned(ref p) => Some(p),`
	`312`	`+ #[cfg(not(panic = "unwind"))]`
	`313`	`+ TryLockError::Poisoned(ref p) => match p._never {},`
`306`	`314`	`_ => None,`
`307`	`315`	`}`
`308`	`316`	`}`