Use if-let guard to avoid unwrapping

fmease · fmease · commit 323c2834bdfe · 2024-03-15T03:39:00.000+01:00
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
@@ -2575,9 +2575,9 @@ impl<'o, 'tcx> dyn HirTyLowerer<'tcx> + 'o {
 
     pub fn lower_arg_ty(&self, ty: &hir::Ty<'tcx>, expected_ty: Option<Ty<'tcx>>) -> Ty<'tcx> {
         match ty.kind {
-            hir::TyKind::Infer if expected_ty.is_some() => {
-                self.record_ty(ty.hir_id, expected_ty.unwrap(), ty.span);
-                expected_ty.unwrap()
+            hir::TyKind::Infer if let Some(expected_ty) = expected_ty => {
+                self.record_ty(ty.hir_id, expected_ty, ty.span);
+                expected_ty
             }
             _ => self.lower_ty(ty),
         }

Original file line number	Diff line number	Diff line change
`@@ -2575,9 +2575,9 @@ impl<'o, 'tcx> dyn HirTyLowerer<'tcx> + 'o {`
`2575`	`2575`
`2576`	`2576`	`pub fn lower_arg_ty(&self, ty: &hir::Ty<'tcx>, expected_ty: Option<Ty<'tcx>>) -> Ty<'tcx> {`
`2577`	`2577`	`match ty.kind {`
`2578`		`- hir::TyKind::Infer if expected_ty.is_some() => {`
`2579`		`- self.record_ty(ty.hir_id, expected_ty.unwrap(), ty.span);`
`2580`		`- expected_ty.unwrap()`
	`2578`	`+ hir::TyKind::Infer if let Some(expected_ty) = expected_ty => {`
	`2579`	`+ self.record_ty(ty.hir_id, expected_ty, ty.span);`
	`2580`	`+ expected_ty`
`2581`	`2581`	`}`
`2582`	`2582`	`_ => self.lower_ty(ty),`
`2583`	`2583`	`}`