diff options
| author | Oli Scherer <github333195615777966@oli-obk.de> | 2025-01-07 15:14:46 +0000 |
|---|---|---|
| committer | Oli Scherer <github333195615777966@oli-obk.de> | 2025-01-09 08:48:46 +0000 |
| commit | 8505904dccfb624e663aef3d50f2e5cefefa73d1 (patch) | |
| tree | 3c5b64ea2027238bac7e609782125517cfc620a2 /compiler/rustc_hir_analysis/src | |
| parent | 07fcead0732d9460978dd3b428cd5edcfa299f9a (diff) | |
| download | rust-8505904dccfb624e663aef3d50f2e5cefefa73d1.tar.gz rust-8505904dccfb624e663aef3d50f2e5cefefa73d1.zip | |
Remove the now-useless `Result` from `lit_to_const`
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs | 9 |
1 files changed, 3 insertions, 6 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 6ed5f92e995..511ecc06e79 100644 --- a/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs +++ b/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs @@ -35,7 +35,7 @@ use rustc_hir::{self as hir, AnonConst, GenericArg, GenericArgs, HirId}; use rustc_infer::infer::{InferCtxt, TyCtxtInferExt}; use rustc_infer::traits::ObligationCause; use rustc_middle::middle::stability::AllowUnstable; -use rustc_middle::mir::interpret::{LitToConstError, LitToConstInput}; +use rustc_middle::mir::interpret::LitToConstInput; use rustc_middle::ty::fold::fold_regions; use rustc_middle::ty::print::PrintPolyTraitRefExt as _; use rustc_middle::ty::{ @@ -2269,7 +2269,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ { // 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).unwrap()); + return Some(tcx.at(expr.span).lit_to_const(lit_input)); } } @@ -2447,10 +2447,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ { hir::PatExprKind::Lit { lit, negated } => { let lit_input = LitToConstInput { lit: &lit.node, ty, neg: negated }; - let ct = match tcx.lit_to_const(lit_input) { - Ok(c) => c, - Err(LitToConstError::TypeError) => todo!(), - }; + let ct = tcx.lit_to_const(lit_input); (ct, ty) } |
