Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/ui/error-codes/E0152-duplicate-lang-items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ extern crate core;

use core::panic::PanicInfo;
Comment thread
bjorn3 marked this conversation as resolved.

#[lang = "panic_impl"]
fn panic_impl(info: &PanicInfo) -> ! {
//~^ ERROR: found duplicate lang item `panic_impl`
#[lang = "eh_personality"]
fn personality() {
//~^ ERROR: found duplicate lang item `eh_personality`
//~| NOTE first defined in crate `std`
loop {}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/error-codes/E0152-duplicate-lang-items.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
error[E0152]: found duplicate lang item `panic_impl`
error[E0152]: found duplicate lang item `eh_personality`
--> $DIR/E0152-duplicate-lang-items.rs:16:1
|
LL | / fn panic_impl(info: &PanicInfo) -> ! {
LL | / fn personality() {
LL | |
LL | |
LL | | loop {}
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/macros/macro-comma-behavior.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#[cfg(core)] use core::fmt;
#[cfg(core)] #[lang = "eh_personality"] fn eh_personality() {}
#[cfg(core)] #[lang = "eh_catch_typeinfo"] static EH_CATCH_TYPEINFO: u8 = 0;
#[cfg(core)] #[lang = "panic_impl"] fn panic_impl(panic: &core::panic::PanicInfo) -> ! { loop {} }
#[cfg(core)] #[panic_handler] fn panic_impl(panic: &core::panic::PanicInfo) -> ! { loop {} }

// (see documentation of the similarly-named test in run-pass)
fn to_format_or_not_to_format() {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/panic-handler/panic-handler-duplicate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fn panic(info: &PanicInfo) -> ! {
loop {}
}

#[lang = "panic_impl"]
#[panic_handler]
fn panic2(info: &PanicInfo) -> ! { //~ ERROR found duplicate lang item `panic_impl`
loop {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

use core::panic::PanicInfo;

#[lang = "panic_impl"]
#[panic_handler]
fn panic_impl(info: &PanicInfo) -> ! { loop {} }
#[lang = "eh_personality"]
fn eh_personality() {}
Expand Down
Loading