diff options
| author | Gary Guo <gary@garyguo.net> | 2021-09-11 03:44:02 +0100 |
|---|---|---|
| committer | Gary Guo <gary@garyguo.net> | 2021-10-19 15:02:21 +0100 |
| commit | 93701569573b367aaeaf659af154f5ae0d49af2b (patch) | |
| tree | 6cf9bc8ba68559e4fb43739911ce9136b9a50cbc /compiler/rustc_const_eval/src/const_eval | |
| parent | 148f456cc6fd12a19f45a75b1fd758605c657d0d (diff) | |
Deduplicate panic_fmt
std's begin_panic_fmt and core's panic_fmt are duplicates. Merge them to declutter code and remove a lang item.
Diffstat (limited to 'compiler/rustc_const_eval/src/const_eval')
| -rw-r--r-- | compiler/rustc_const_eval/src/const_eval/machine.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_const_eval/src/const_eval/machine.rs b/compiler/rustc_const_eval/src/const_eval/machine.rs index ae20f6f97b2..adc574ce9c9 100644 --- a/compiler/rustc_const_eval/src/const_eval/machine.rs +++ b/compiler/rustc_const_eval/src/const_eval/machine.rs @@ -51,9 +51,7 @@ impl<'mir, 'tcx> InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>> { let span = self.find_closest_untracked_caller_location(); let (file, line, col) = self.location_triple_for_span(span); return Err(ConstEvalErrKind::Panic { msg, file, line, col }.into()); - } else if Some(def_id) == self.tcx.lang_items().panic_fmt() - || Some(def_id) == self.tcx.lang_items().begin_panic_fmt() - { + } else if Some(def_id) == self.tcx.lang_items().panic_fmt() { // For panic_fmt, call const_panic_fmt instead. if let Some(const_panic_fmt) = self.tcx.lang_items().const_panic_fmt() { return Ok(Some( |
