diff options
| author | bors <bors@rust-lang.org> | 2024-02-11 05:13:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-11 05:13:02 +0000 |
| commit | a40a100e4bc5db830169f59cc301a1105dd366d8 (patch) | |
| tree | 3dfb18335ff56656383b97106112e199617842e6 /src/tools | |
| parent | 5a3a2d5a5ea80b04df3fd3406f2bd924763d78a6 (diff) | |
| parent | 48bb2bf4e6bfc5c9ffc9cb3f34a9163c05ce2cb2 (diff) | |
Auto merge of #3294 - rust-lang:rustup-2024-02-11, r=saethlin
Automatic Rustup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/miri/rust-version | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/diagnostics.rs | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version index 7d077a9c547..11d4766b93c 100644 --- a/src/tools/miri/rust-version +++ b/src/tools/miri/rust-version @@ -1 +1 @@ -b5c46dc5426038a49c95398bce30eeb20ec421e2 +0cbef48150e1fab161b5fd147b57ceb3f9272a52 diff --git a/src/tools/miri/src/diagnostics.rs b/src/tools/miri/src/diagnostics.rs index cad85258f50..7825673db00 100644 --- a/src/tools/miri/src/diagnostics.rs +++ b/src/tools/miri/src/diagnostics.rs @@ -285,7 +285,10 @@ pub fn report_error<'tcx, 'mir>( ) => { ecx.handle_ice(); // print interpreter backtrace - bug!("This validation error should be impossible in Miri: {}", ecx.format_error(e)); + bug!( + "This validation error should be impossible in Miri: {}", + format_interp_error(ecx.tcx.dcx(), e) + ); } UndefinedBehavior(_) => "Undefined Behavior", ResourceExhaustion(_) => "resource exhaustion", @@ -299,7 +302,10 @@ pub fn report_error<'tcx, 'mir>( ) => "post-monomorphization error", _ => { ecx.handle_ice(); // print interpreter backtrace - bug!("This error should be impossible in Miri: {}", ecx.format_error(e)); + bug!( + "This error should be impossible in Miri: {}", + format_interp_error(ecx.tcx.dcx(), e) + ); } }; #[rustfmt::skip] @@ -365,7 +371,7 @@ pub fn report_error<'tcx, 'mir>( _ => {} } - msg.insert(0, ecx.format_error(e)); + msg.insert(0, format_interp_error(ecx.tcx.dcx(), e)); report_msg( DiagLevel::Error, |