diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-03-10 22:16:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-10 22:16:43 +0100 |
| commit | b02f2a0e76f46f7ed244a686c4909635495ee254 (patch) | |
| tree | ad1c9e9fbbf48b44f8b59490edfd25e26534bfce /compiler/rustc_const_eval/src | |
| parent | ff09d32d8321cce425e5f266e1b9372e9b749a20 (diff) | |
| parent | aa9145e6ea9ae518355b2c8c7f6de6d61c385e38 (diff) | |
| download | rust-b02f2a0e76f46f7ed244a686c4909635495ee254.tar.gz rust-b02f2a0e76f46f7ed244a686c4909635495ee254.zip | |
Rollup merge of #122286 - RalfJung:resolve, r=compiler-errors
use Instance::expect_resolve() instead of unwraping Instance::resolve()
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/const_eval/machine.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_const_eval/src/const_eval/machine.rs b/compiler/rustc_const_eval/src/const_eval/machine.rs index 6736fc749c0..f104b836716 100644 --- a/compiler/rustc_const_eval/src/const_eval/machine.rs +++ b/compiler/rustc_const_eval/src/const_eval/machine.rs @@ -243,14 +243,12 @@ impl<'mir, 'tcx: 'mir> CompileTimeEvalContext<'mir, 'tcx> { } else if Some(def_id) == self.tcx.lang_items().panic_fmt() { // For panic_fmt, call const_panic_fmt instead. let const_def_id = self.tcx.require_lang_item(LangItem::ConstPanicFmt, None); - let new_instance = ty::Instance::resolve( + let new_instance = ty::Instance::expect_resolve( *self.tcx, ty::ParamEnv::reveal_all(), const_def_id, instance.args, - ) - .unwrap() - .unwrap(); + ); return Ok(Some(new_instance)); } else if Some(def_id) == self.tcx.lang_items().align_offset_fn() { |