From 84c8d4f52d5be135e2dec89379cb1d0f67be648c Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Wed, 8 Jan 2025 12:40:02 +0000 Subject: [PATCH] Use option combinators instead of manual if/return --- .../rustc_hir_analysis/src/hir_ty_lowering/mod.rs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs index 511ecc06e796..cb90fff782fb 100644 --- a/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs +++ b/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs @@ -2262,18 +2262,11 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ { _ => None, }; - if let Some(lit_input) = lit_input { - // If an error occurred, ignore that it's a literal and leave reporting the error up to - // mir. - + lit_input // Allow the `ty` to be an alias type, though we cannot handle it here, we just go through // the more expensive anon const code path. - if !lit_input.ty.has_aliases() { - return Some(tcx.at(expr.span).lit_to_const(lit_input)); - } - } - - None + .filter(|l| !l.ty.has_aliases()) + .map(|l| tcx.at(expr.span).lit_to_const(l)) } fn lower_delegation_ty(&self, idx: hir::InferDelegationKind) -> Ty<'tcx> {