Simplify conditional erroring

oli-obk · oli-obk · commit 23277a502ef6 · 2024-02-09T20:23:18.000Z
diff --git a/compiler/rustc_hir_analysis/src/coherence/builtin.rs b/compiler/rustc_hir_analysis/src/coherence/builtin.rs
@@ -57,11 +57,7 @@ impl<'tcx> Checker<'tcx> {
     where
         F: FnMut(TyCtxt<'tcx>, LocalDefId) -> Result<(), ErrorGuaranteed>,
     {
-        let mut res = Ok(());
-        if Some(self.trait_def_id) == trait_def_id {
-            res = res.and(f(self.tcx, self.impl_def_id));
-        }
-        res
+        if Some(self.trait_def_id) == trait_def_id { f(self.tcx, self.impl_def_id) } else { Ok(()) }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,7 @@ impl<'tcx> Checker<'tcx> {`
`57`	`57`	`where`
`58`	`58`	`F: FnMut(TyCtxt<'tcx>, LocalDefId) -> Result<(), ErrorGuaranteed>,`
`59`	`59`	`{`
`60`		`- let mut res = Ok(());`
`61`		`- if Some(self.trait_def_id) == trait_def_id {`
`62`		`- res = res.and(f(self.tcx, self.impl_def_id));`
`63`		`- }`
`64`		`- res`
	`60`	`+ if Some(self.trait_def_id) == trait_def_id { f(self.tcx, self.impl_def_id) } else { Ok(()) }`
`65`	`61`	`}`
`66`	`62`	`}`
`67`	`63`