diff options
| author | bors <bors@rust-lang.org> | 2020-01-16 07:20:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-16 07:20:52 +0000 |
| commit | 9fe05e9456b84996637c2f29b35c37960e537540 (patch) | |
| tree | 63b90b70dd13343e901b28e5f857ac404d8b32fa /src/test/ui/panic-handler/panic-handler-std.rs | |
| parent | e02c475da5c7d942cac2e3cf9683ea4117d4fe46 (diff) | |
| parent | 90b9a627bf191ac0726ce96e02d44a42ff445bf2 (diff) | |
| download | rust-9fe05e9456b84996637c2f29b35c37960e537540.tar.gz rust-9fe05e9456b84996637c2f29b35c37960e537540.zip | |
Auto merge of #68272 - Dylan-DPC:rollup-vrb90gu, r=Dylan-DPC
Rollup of 5 pull requests
Successful merges:
- #67780 (Move some queries from rustc::ty to librustc_ty.)
- #68096 (Clean up some diagnostics by making them more consistent)
- #68223 (Use 3.6 instead of 3.5 in float fract() documentation)
- #68265 (Fix some issue numbers of unstable features)
- #68266 (Changed docs for f32 and f64.)
Failed merges:
- #68204 (Use named fields for `{ast,hir}::ItemKind::Impl`)
r? @ghost
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; |