diff options
| author | bors <bors@rust-lang.org> | 2024-04-17 14:25:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-17 14:25:10 +0000 |
| commit | 00ed4edb44ccc76d8cc992ef9f9f4634ea6d0e82 (patch) | |
| tree | 52396d96cc39e2268ae39fad1ab72e5d0b99336f /tests/ui/error-codes | |
| parent | 6c6b3027ef62e911142cfc55589baef4e9f38ec8 (diff) | |
| parent | c0a9c8c9549662ec9199112cb59592ef2c617412 (diff) | |
| download | rust-00ed4edb44ccc76d8cc992ef9f9f4634ea6d0e82.tar.gz rust-00ed4edb44ccc76d8cc992ef9f9f4634ea6d0e82.zip | |
Auto merge of #123674 - oli-obk:bogus_note, r=estebank
Silence some follow-up errors on trait impls in case the trait has conflicting or otherwise incoherent impls fixes #123292 Also removes a bunch of extra diagnostics that were introduced in https://github.com/rust-lang/rust/pull/121154 and https://github.com/rust-lang/rust/pull/120558
Diffstat (limited to 'tests/ui/error-codes')
| -rw-r--r-- | tests/ui/error-codes/E0117.rs | 1 | ||||
| -rw-r--r-- | tests/ui/error-codes/E0117.stderr | 14 |
2 files changed, 3 insertions, 12 deletions
diff --git a/tests/ui/error-codes/E0117.rs b/tests/ui/error-codes/E0117.rs index 32b9863806c..406d24e3666 100644 --- a/tests/ui/error-codes/E0117.rs +++ b/tests/ui/error-codes/E0117.rs @@ -1,5 +1,4 @@ impl Drop for u32 {} //~ ERROR E0117 //~| ERROR the `Drop` trait may only be implemented for local structs, enums, and unions -//~| ERROR not all trait items implemented fn main() {} diff --git a/tests/ui/error-codes/E0117.stderr b/tests/ui/error-codes/E0117.stderr index 058a64b20d1..f144aa9f72c 100644 --- a/tests/ui/error-codes/E0117.stderr +++ b/tests/ui/error-codes/E0117.stderr @@ -15,15 +15,7 @@ error[E0120]: the `Drop` trait may only be implemented for local structs, enums, LL | impl Drop for u32 {} | ^^^ must be a struct, enum, or union in the current crate -error[E0046]: not all trait items implemented, missing: `drop` - --> $DIR/E0117.rs:1:1 - | -LL | impl Drop for u32 {} - | ^^^^^^^^^^^^^^^^^ missing `drop` in implementation - | - = help: implement the missing item: `fn drop(&mut self) { todo!() }` - -error: aborting due to 3 previous errors +error: aborting due to 2 previous errors -Some errors have detailed explanations: E0046, E0117, E0120. -For more information about an error, try `rustc --explain E0046`. +Some errors have detailed explanations: E0117, E0120. +For more information about an error, try `rustc --explain E0117`. |