diff options
| author | bors <bors@rust-lang.org> | 2024-06-11 22:20:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-11 22:20:35 +0000 |
| commit | ebcb862bbb9031c4969c06ec73d44780ea37d0ff (patch) | |
| tree | f71fabd3f6c637b9eeb5afb72180a50f8ba285b3 /tests/ui/panic-handler/panic-handler-std.rs | |
| parent | d0227c6a19c2d6e8dceb87c7a2776dc2b10d2a04 (diff) | |
| parent | e37c423f106a16302718c5e413166b74ea3d4583 (diff) | |
Auto merge of #126284 - jieyouxu:rollup-nq7bf9k, r=jieyouxu
Rollup of 6 pull requests Successful merges: - #115974 (Split core's PanicInfo and std's PanicInfo) - #125659 (Remove usage of `isize` in example) - #125669 (CI: Update riscv64gc-linux job to Ubuntu 22.04, rename to riscv64gc-gnu) - #125684 (Account for existing bindings when suggesting `pin!()`) - #126055 (Expand list of trait implementers in E0277 when calling rustc with --verbose) - #126174 (Migrate `tests/run-make/prefer-dylib` to `rmake.rs`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/panic-handler/panic-handler-std.rs')
| -rw-r--r-- | tests/ui/panic-handler/panic-handler-std.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/ui/panic-handler/panic-handler-std.rs b/tests/ui/panic-handler/panic-handler-std.rs index 91b3997819c..051828ec880 100644 --- a/tests/ui/panic-handler/panic-handler-std.rs +++ b/tests/ui/panic-handler/panic-handler-std.rs @@ -1,8 +1,9 @@ //@ normalize-stderr-test "loaded from .*libstd-.*.rlib" -> "loaded from SYSROOT/libstd-*.rlib" //@ error-pattern: found duplicate lang item `panic_impl` +extern crate core; -use std::panic::PanicInfo; +use core::panic::PanicInfo; #[panic_handler] fn panic(info: PanicInfo) -> ! { |