diff options
| author | Jorge Aparicio <jorge.aparicio@ferrous-systems.com> | 2020-01-20 07:50:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 07:50:32 +0000 |
| commit | a3a077610028c773bffc7a74e6a15faa10d2360d (patch) | |
| tree | 819cf353c019f421d80d9545aa18583841c34348 /src/test/ui/panic-handler/panic-handler-std.rs | |
| parent | 470cdf54ac9acee20ab8da46ef7899bae9f58f29 (diff) | |
| parent | 29b854fb741809c29764e33fc17c32ba9c6523ba (diff) | |
| download | rust-a3a077610028c773bffc7a74e6a15faa10d2360d.tar.gz rust-a3a077610028c773bffc7a74e6a15faa10d2360d.zip | |
Merge branch 'master' into bare-metal-cortex-a
Diffstat (limited to 'src/test/ui/panic-handler/panic-handler-std.rs')
| -rw-r--r-- | src/test/ui/panic-handler/panic-handler-std.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/panic-handler/panic-handler-std.rs b/src/test/ui/panic-handler/panic-handler-std.rs index fffb5977871..0acc2722cb2 100644 --- a/src/test/ui/panic-handler/panic-handler-std.rs +++ b/src/test/ui/panic-handler/panic-handler-std.rs @@ -1,4 +1,4 @@ -// error-pattern: duplicate lang item found: `panic_impl`. +// error-pattern: found duplicate lang item `panic_impl` use std::panic::PanicInfo; |