about summary refs log tree commit diff
path: root/tests/ui/panic-handler/panic-handler-std.stderr
diff options
context:
space:
mode:
authorJubilee <46493976+workingjubilee@users.noreply.github.com>2023-12-15 14:08:15 -0800
committerGitHub <noreply@github.com>2023-12-15 14:08:15 -0800
commit1d54949765e88e70ae9df91d545fc7e5a6dbe016 (patch)
tree7b30f4a5466ac6a39e51f8e6035aaf6ef97b5947 /tests/ui/panic-handler/panic-handler-std.stderr
parenta96d57bdb6d2bb6d233d7d5aaefc2995ab99be01 (diff)
parentbc1ca6b52854d09cfdcb83d0559f3e72720aa41f (diff)
Rollup merge of #118396 - compiler-errors:ast-lang-items, r=cjgillot
Collect lang items from AST, get rid of `GenericBound::LangItemTrait`

r? `@cjgillot`
cc #115178

Looking forward, the work to remove `QPath::LangItem` will also be significantly more difficult, but I plan on doing it as well. Specifically, we have to change:
1. A lot of `rustc_ast_lowering` for things like expr `..`
2. A lot of astconv, since we actually instantiate lang and non-lang paths quite differently.
3. A ton of diagnostics and clippy lints that are special-cased via `QPath::LangItem`

Meanwhile, it was pretty easy to remove `GenericBound::LangItemTrait`, so I just did that here.
Diffstat (limited to 'tests/ui/panic-handler/panic-handler-std.stderr')
-rw-r--r--tests/ui/panic-handler/panic-handler-std.stderr6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/ui/panic-handler/panic-handler-std.stderr b/tests/ui/panic-handler/panic-handler-std.stderr
index ad9addec8eb..48c216ce27e 100644
--- a/tests/ui/panic-handler/panic-handler-std.stderr
+++ b/tests/ui/panic-handler/panic-handler-std.stderr
@@ -1,8 +1,10 @@
 error[E0152]: found duplicate lang item `panic_impl`
   --> $DIR/panic-handler-std.rs:8:1
    |
-LL | fn panic(info: PanicInfo) -> ! {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | / fn panic(info: PanicInfo) -> ! {
+LL | |     loop {}
+LL | | }
+   | |_^
    |
    = note: the lang item is first defined in crate `std` (which `panic_handler_std` depends on)
    = note: first definition in `std` loaded from SYSROOT/libstd-*.rlib