about summary refs log tree commit diff
path: root/compiler/rustc_span/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-10-12 14:39:43 +0000
committerbors <bors@rust-lang.org>2022-10-12 14:39:43 +0000
commit538f118da1409759ba198acc0ff62070bc6d2dce (patch)
tree3becd0807c9f252f25ed5c7936e8bfc0f2f1fdff /compiler/rustc_span/src
parent50f6d337c632cbb5bd1dc3a80b5d428cebd8dce4 (diff)
parent38c78a9ac17caefd4c5e6d0b332814b2ac2cf3a8 (diff)
downloadrust-538f118da1409759ba198acc0ff62070bc6d2dce.tar.gz
rust-538f118da1409759ba198acc0ff62070bc6d2dce.zip
Auto merge of #102732 - RalfJung:assert_unsafe_precondition2, r=bjorn3
nicer errors from assert_unsafe_precondition

This makes the errors shown by cargo-careful nicer, and since `panic_no_unwind` is `nounwind noreturn` it hopefully doesn't have bad codegen impact. Thanks to `@bjorn3` for the hint!

Would be nice if we could somehow supply our own (static) message to print, currently it always prints `panic in a function that cannot unwind`. But still, this is better than before.
Diffstat (limited to 'compiler/rustc_span/src')
-rw-r--r--compiler/rustc_span/src/symbol.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
index fe4fd33bdba..c6711b603b6 100644
--- a/compiler/rustc_span/src/symbol.rs
+++ b/compiler/rustc_span/src/symbol.rs
@@ -1231,7 +1231,6 @@ symbols! {
         rust_oom,
         rustc,
         rustc_allocator,
-        rustc_allocator_nounwind,
         rustc_allocator_zeroed,
         rustc_allow_const_fn_unstable,
         rustc_allow_incoherent_impl,
@@ -1278,6 +1277,7 @@ symbols! {
         rustc_mir,
         rustc_must_implement_one_of,
         rustc_nonnull_optimization_guaranteed,
+        rustc_nounwind,
         rustc_object_lifetime_default,
         rustc_on_unimplemented,
         rustc_outlives,