Unrolled build for rust-lang#131815

rust-timer · web-flow · commit 7b245461fcce · 2024-10-17T09:51:01.000-04:00
Rollup merge of rust-lang#131815 - workingjubilee:did-you-mean-is-none-or, r=jieyouxu compiler: use `is_none_or` where it is clearly better heuristic was: if it easily allows removing bangs entirely? worth it. if it requires more effort or just moves the bang? not.
diff --git a/compiler/rustc_resolve/src/check_unused.rs b/compiler/rustc_resolve/src/check_unused.rs
@@ -184,11 +184,11 @@ impl<'a, 'ra, 'tcx> UnusedImportCheckVisitor<'a, 'ra, 'tcx> {
 
             // If the extern crate isn't in the extern prelude,
             // there is no way it can be written as a `use`.
-            if !self
+            if self
                 .r
                 .extern_prelude
                 .get(&extern_crate.ident)
-                .is_some_and(|entry| !entry.introduced_by_item)
+                .is_none_or(|entry| entry.introduced_by_item)
             {
                 continue;
             }
diff --git a/compiler/rustc_type_ir/src/search_graph/mod.rs b/compiler/rustc_type_ir/src/search_graph/mod.rs
@@ -714,7 +714,7 @@ impl<D: Delegate<Cx = X>, X: Cx> SearchGraph<D> {
                 // current goal is already part of the same cycle. This check could be
                 // improved but seems to be good enough for now.
                 let last = self.stack.raw.last().unwrap();
-                if !last.heads.opt_lowest_cycle_head().is_some_and(|lowest| lowest <= head) {
+                if last.heads.opt_lowest_cycle_head().is_none_or(|lowest| lowest > head) {
                     continue;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -184,11 +184,11 @@ impl<'a, 'ra, 'tcx> UnusedImportCheckVisitor<'a, 'ra, 'tcx> {`
`184`	`184`
`185`	`185`	`// If the extern crate isn't in the extern prelude,`
`186`	`186`	// there is no way it can be written as a `use`.
`187`		`- if !self`
	`187`	`+ if self`
`188`	`188`	`.r`
`189`	`189`	`.extern_prelude`
`190`	`190`	`.get(&extern_crate.ident)`
`191`		`- .is_some_and(\|entry\| !entry.introduced_by_item)`
	`191`	`+ .is_none_or(\|entry\| entry.introduced_by_item)`
`192`	`192`	`{`
`193`	`193`	`continue;`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ impl<D: Delegate<Cx = X>, X: Cx> SearchGraph<D> {`
`714`	`714`	`// current goal is already part of the same cycle. This check could be`
`715`	`715`	`// improved but seems to be good enough for now.`
`716`	`716`	`let last = self.stack.raw.last().unwrap();`
`717`		`- if !last.heads.opt_lowest_cycle_head().is_some_and(\|lowest\| lowest <= head) {`
	`717`	`+ if last.heads.opt_lowest_cycle_head().is_none_or(\|lowest\| lowest > head) {`
`718`	`718`	`continue;`
`719`	`719`	`}`
`720`	`720`	`}`