Avoid Option::is_none_or for a while

lnicola · lnicola · commit 42ed30f0c6a5 · 2024-09-02T20:04:35.000+03:00
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs b/src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs
@@ -287,7 +287,7 @@ pub(crate) fn const_eval_discriminant_variant(
     }
 
     let repr = db.enum_data(loc.parent).repr;
-    let is_signed = repr.and_then(|repr| repr.int).is_none_or(|int| int.is_signed());
+    let is_signed = IsNoneOr::is_none_or(repr.and_then(|repr| repr.int), |int| int.is_signed());
 
     let mir_body = db.monomorphized_mir_body(
         def,

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ pub(crate) fn const_eval_discriminant_variant(`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`let repr = db.enum_data(loc.parent).repr;`
`290`		`- let is_signed = repr.and_then(\|repr\| repr.int).is_none_or(\|int\| int.is_signed());`
	`290`	`+ let is_signed = IsNoneOr::is_none_or(repr.and_then(\|repr\| repr.int), \|int\| int.is_signed());`
`291`	`291`
`292`	`292`	`let mir_body = db.monomorphized_mir_body(`
`293`	`293`	`def,`