Replace redundant unwrap with get_or_insert_with

zetanumbers · zetanumbers · commit d0f5b5caa865 · 2026-04-16T15:19:42.000+03:00
diff --git a/compiler/rustc_middle/src/query/job.rs b/compiler/rustc_middle/src/query/job.rs
@@ -36,10 +36,7 @@ impl<'tcx> QueryJob<'tcx> {
     }
 
     pub fn latch(&mut self) -> QueryLatch<'tcx> {
-        if self.latch.is_none() {
-            self.latch = Some(QueryLatch::new());
-        }
-        self.latch.as_ref().unwrap().clone()
+        self.latch.get_or_insert_with(QueryLatch::new).clone()
     }
 
     /// Signals to waiters that the query is complete.

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,7 @@ impl<'tcx> QueryJob<'tcx> {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`pub fn latch(&mut self) -> QueryLatch<'tcx> {`
`39`		`- if self.latch.is_none() {`
`40`		`- self.latch = Some(QueryLatch::new());`
`41`		`- }`
`42`		`- self.latch.as_ref().unwrap().clone()`
	`39`	`+ self.latch.get_or_insert_with(QueryLatch::new).clone()`
`43`	`40`	`}`
`44`	`41`
`45`	`42`	`/// Signals to waiters that the query is complete.`