Bless tests/ui

mu001999 · mu001999 · commit b136b78401cc · 2024-05-26T23:38:07.000+08:00
diff --git a/compiler/rustc_middle/src/hir/nested_filter.rs b/compiler/rustc_middle/src/hir/nested_filter.rs
@@ -11,7 +11,7 @@ use rustc_hir::intravisit::nested_filter::NestedFilter;
 /// to use `visit_all_item_likes_in_crate()` as an outer loop,
 /// and to have the visitor that visits the contents of each item
 /// using this setting.
-pub struct OnlyBodies(());
+pub struct OnlyBodies;
 impl<'hir> NestedFilter<'hir> for OnlyBodies {
     type Map = crate::hir::map::Map<'hir>;
     const INTER: bool = false;
diff --git a/tests/ui/coherence/re-rebalance-coherence.rs b/tests/ui/coherence/re-rebalance-coherence.rs
@@ -4,6 +4,7 @@
 extern crate re_rebalance_coherence_lib as lib;
 use lib::*;
 
+#[allow(dead_code)]
 struct Oracle;
 impl Backend for Oracle {}
 impl<'a, T:'a, Tab> QueryFragment<Oracle> for BatchInsert<'a, T, Tab> {}
diff --git a/tests/ui/const-generics/defaults/repr-c-issue-82792.rs b/tests/ui/const-generics/defaults/repr-c-issue-82792.rs
@@ -2,6 +2,7 @@
 
 //@ run-pass
 
+#[allow(dead_code)]
 #[repr(C)]
 pub struct Loaf<T: Sized, const N: usize = 1> {
     head: [T; N],
diff --git a/tests/ui/const-generics/generic_const_exprs/associated-consts.rs b/tests/ui/const-generics/generic_const_exprs/associated-consts.rs
@@ -16,7 +16,8 @@ impl BlockCipher for BarCipher {
     const BLOCK_SIZE: usize = 32;
 }
 
-pub struct Block<C>(#[allow(dead_code)] C);
+#[allow(dead_code)]
+pub struct Block<C>(C);
 
 pub fn test<C: BlockCipher, const M: usize>()
 where
diff --git a/tests/ui/const-generics/transparent-maybeunit-array-wrapper.rs b/tests/ui/const-generics/transparent-maybeunit-array-wrapper.rs
@@ -6,6 +6,7 @@
 
 use std::mem::MaybeUninit;
 
+#[allow(dead_code)]
 #[repr(transparent)]
 pub struct MaybeUninitWrapper<const N: usize>(MaybeUninit<[u64; N]>);
 
diff --git a/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.rs b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.rs
@@ -1,9 +1,9 @@
 #![forbid(dead_code)]
 
 #[derive(Debug)]
-pub struct Whatever {
+pub struct Whatever { //~ ERROR struct `Whatever` is never constructed
     pub field0: (),
-    field1: (), //~ ERROR fields `field1`, `field2`, `field3`, and `field4` are never read
+    field1: (),
     field2: (),
     field3: (),
     field4: (),
diff --git a/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr
@@ -1,19 +1,9 @@
-error: fields `field1`, `field2`, `field3`, and `field4` are never read
-  --> $DIR/clone-debug-dead-code-in-the-same-struct.rs:6:5
+error: struct `Whatever` is never constructed
+  --> $DIR/clone-debug-dead-code-in-the-same-struct.rs:4:12
    |
 LL | pub struct Whatever {
-   |            -------- fields in this struct
-LL |     pub field0: (),
-LL |     field1: (),
-   |     ^^^^^^
-LL |     field2: (),
-   |     ^^^^^^
-LL |     field3: (),
-   |     ^^^^^^
-LL |     field4: (),
-   |     ^^^^^^
+   |            ^^^^^^^^
    |
-   = note: `Whatever` has a derived impl for the trait `Debug`, but this is intentionally ignored during dead code analysis
 note: the lint level is defined here
   --> $DIR/clone-debug-dead-code-in-the-same-struct.rs:1:11
    |
diff --git a/tests/ui/issues/issue-5708.rs b/tests/ui/issues/issue-5708.rs
@@ -44,6 +44,7 @@ pub trait MyTrait<T> {
     fn dummy(&self, t: T) -> T { panic!() }
 }
 
+#[allow(dead_code)]
 pub struct MyContainer<'a, T:'a> {
     foos: Vec<&'a (dyn MyTrait<T>+'a)> ,
 }
diff --git a/tests/ui/lint/dead-code/lint-dead-code-1.rs b/tests/ui/lint/dead-code/lint-dead-code-1.rs
@@ -49,8 +49,8 @@ impl SemiUsedStruct {
 struct StructUsedAsField;
 pub struct StructUsedInEnum;
 struct StructUsedInGeneric;
+#[allow(dead_code)]
 pub struct PubStruct2 {
-    #[allow(dead_code)]
     struct_used_as_field: *const StructUsedAsField
 }
 
diff --git a/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.fixed b/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.fixed
@@ -1,7 +1,8 @@
 // Regression test for issues #100790 and #106439.
 //@ run-rustfix
 
-pub struct Example(#[allow(dead_code)] usize)
+#[allow(dead_code)]
+pub struct Example(usize)
 where
     (): Sized;
 //~^^^ ERROR where clauses are not allowed before tuple struct bodies
diff --git a/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.rs b/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.rs
@@ -1,10 +1,11 @@
 // Regression test for issues #100790 and #106439.
 //@ run-rustfix
 
+#[allow(dead_code)]
 pub struct Example
 where
     (): Sized,
-(#[allow(dead_code)] usize);
+(usize);
 //~^^^ ERROR where clauses are not allowed before tuple struct bodies
 
 struct _Demo
diff --git a/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.stderr b/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.stderr
@@ -1,23 +1,23 @@
 error: where clauses are not allowed before tuple struct bodies
-  --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:5:1
+  --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:6:1
    |
 LL |   pub struct Example
    |              ------- while parsing this tuple struct
 LL | / where
 LL | |     (): Sized,
    | |______________^ unexpected where clause
-LL |   (#[allow(dead_code)] usize);
-   |   --------------------------- the struct body
+LL |   (usize);
+   |   ------- the struct body
    |
 help: move the body before the where clause
    |
-LL ~ pub struct Example(#[allow(dead_code)] usize)
+LL ~ pub struct Example(usize)
 LL | where
 LL ~     (): Sized;
    |
 
 error: where clauses are not allowed before tuple struct bodies
-  --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:11:1
+  --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:12:1
    |
 LL |   struct _Demo
    |          ----- while parsing this tuple struct
diff --git a/tests/ui/pub/pub-ident-struct-4.fixed b/tests/ui/pub/pub-ident-struct-4.fixed
@@ -1,6 +1,7 @@
 //@ run-rustfix
 
-pub struct T(#[allow(dead_code)] String);
+#[allow(dead_code)]
+pub struct T(String);
 //~^ ERROR missing `struct` for struct definition
 
 fn main() {}
diff --git a/tests/ui/pub/pub-ident-struct-4.rs b/tests/ui/pub/pub-ident-struct-4.rs
@@ -1,6 +1,7 @@
 //@ run-rustfix
 
-pub T(#[allow(dead_code)] String);
+#[allow(dead_code)]
+pub T(String);
 //~^ ERROR missing `struct` for struct definition
 
 fn main() {}
diff --git a/tests/ui/pub/pub-ident-struct-4.stderr b/tests/ui/pub/pub-ident-struct-4.stderr
@@ -1,12 +1,12 @@
 error: missing `struct` for struct definition
-  --> $DIR/pub-ident-struct-4.rs:3:4
+  --> $DIR/pub-ident-struct-4.rs:4:4
    |
-LL | pub T(#[allow(dead_code)] String);
+LL | pub T(String);
    |    ^
    |
 help: add `struct` here to parse `T` as a public struct
    |
-LL | pub struct T(#[allow(dead_code)] String);
+LL | pub struct T(String);
    |     ++++++
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/regions/regions-issue-21422.rs b/tests/ui/regions/regions-issue-21422.rs
@@ -5,6 +5,7 @@
 
 //@ pretty-expanded FIXME #23616
 
+#[allow(dead_code)]
 pub struct P<'a> {
     _ptr: *const &'a u8,
 }
diff --git a/tests/ui/structs-enums/newtype-struct-with-dtor.rs b/tests/ui/structs-enums/newtype-struct-with-dtor.rs
@@ -3,8 +3,10 @@
 #![allow(unused_variables)]
 //@ pretty-expanded FIXME #23616
 
+#[allow(dead_code)]
 pub struct Fd(u32);
 
+#[allow(dead_code)]
 fn foo(a: u32) {}
 
 impl Drop for Fd {
diff --git a/tests/ui/structs-enums/uninstantiable-struct.rs b/tests/ui/structs-enums/uninstantiable-struct.rs
@@ -1,4 +1,5 @@
 //@ run-pass
-pub struct Z(#[allow(dead_code)] &'static Z);
+#[allow(dead_code)]
+pub struct Z(&'static Z);
 
 pub fn main() {}
diff --git a/tests/ui/suggestions/derive-clone-for-eq.fixed b/tests/ui/suggestions/derive-clone-for-eq.fixed
@@ -1,6 +1,7 @@
 //@ run-rustfix
 // https://github.com/rust-lang/rust/issues/79076
 
+#[allow(dead_code)]
 #[derive(Clone, Eq)] //~ ERROR [E0277]
 pub struct Struct<T: std::clone::Clone>(T);
 
diff --git a/tests/ui/suggestions/derive-clone-for-eq.rs b/tests/ui/suggestions/derive-clone-for-eq.rs
@@ -1,6 +1,7 @@
 //@ run-rustfix
 // https://github.com/rust-lang/rust/issues/79076
 
+#[allow(dead_code)]
 #[derive(Clone, Eq)] //~ ERROR [E0277]
 pub struct Struct<T>(T);
 
diff --git a/tests/ui/suggestions/derive-clone-for-eq.stderr b/tests/ui/suggestions/derive-clone-for-eq.stderr
@@ -1,11 +1,11 @@
 error[E0277]: the trait bound `T: Clone` is not satisfied
-  --> $DIR/derive-clone-for-eq.rs:4:17
+  --> $DIR/derive-clone-for-eq.rs:5:17
    |
 LL | #[derive(Clone, Eq)]
    |                 ^^ the trait `Clone` is not implemented for `T`, which is required by `Struct<T>: PartialEq`
    |
 note: required for `Struct<T>` to implement `PartialEq`
-  --> $DIR/derive-clone-for-eq.rs:7:19
+  --> $DIR/derive-clone-for-eq.rs:8:19
    |
 LL | impl<T: Clone, U> PartialEq<U> for Struct<T>
    |         -----     ^^^^^^^^^^^^     ^^^^^^^^^
diff --git a/tests/ui/suggestions/option-content-move.fixed b/tests/ui/suggestions/option-content-move.fixed
@@ -1,4 +1,5 @@
 //@ run-rustfix
+#[allow(dead_code)]
 pub struct LipogramCorpora {
     selections: Vec<(char, Option<String>)>,
 }
@@ -17,6 +18,7 @@ impl LipogramCorpora {
     }
 }
 
+#[allow(dead_code)]
 pub struct LipogramCorpora2 {
     selections: Vec<(char, Result<String, String>)>,
 }
diff --git a/tests/ui/suggestions/option-content-move.rs b/tests/ui/suggestions/option-content-move.rs
@@ -1,4 +1,5 @@
 //@ run-rustfix
+#[allow(dead_code)]
 pub struct LipogramCorpora {
     selections: Vec<(char, Option<String>)>,
 }
@@ -17,6 +18,7 @@ impl LipogramCorpora {
     }
 }
 
+#[allow(dead_code)]
 pub struct LipogramCorpora2 {
     selections: Vec<(char, Result<String, String>)>,
 }
diff --git a/tests/ui/suggestions/option-content-move.stderr b/tests/ui/suggestions/option-content-move.stderr
@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of `selection.1` which is behind a shared reference
-  --> $DIR/option-content-move.rs:10:20
+  --> $DIR/option-content-move.rs:11:20
    |
 LL |                 if selection.1.unwrap().contains(selection.0) {
    |                    ^^^^^^^^^^^ -------- `selection.1` moved due to this method call
@@ -19,7 +19,7 @@ LL |                 if selection.1.clone().unwrap().contains(selection.0) {
    |                               ++++++++
 
 error[E0507]: cannot move out of `selection.1` which is behind a shared reference
-  --> $DIR/option-content-move.rs:28:20
+  --> $DIR/option-content-move.rs:30:20
    |
 LL |                 if selection.1.unwrap().contains(selection.0) {
    |                    ^^^^^^^^^^^ -------- `selection.1` moved due to this method call
diff --git a/tests/ui/traits/object/generics.rs b/tests/ui/traits/object/generics.rs
@@ -7,6 +7,7 @@ pub trait Trait2<A> {
     fn doit(&self) -> A;
 }
 
+#[allow(dead_code)]
 pub struct Impl<A1, A2, A3> {
     m1: marker::PhantomData<(A1,A2,A3)>,
     /*

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ impl BlockCipher for BarCipher {`
`16`	`16`	`const BLOCK_SIZE: usize = 32;`
`17`	`17`	`}`
`18`	`18`
`19`		`-pub struct Block<C>(#[allow(dead_code)] C);`
	`19`	`+#[allow(dead_code)]`
	`20`	`+pub struct Block<C>(C);`
`20`	`21`
`21`	`22`	`pub fn test<C: BlockCipher, const M: usize>()`
`22`	`23`	`where`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ pub trait MyTrait<T> {`
`44`	`44`	`fn dummy(&self, t: T) -> T { panic!() }`
`45`	`45`	`}`
`46`	`46`
	`47`	`+#[allow(dead_code)]`
`47`	`48`	`pub struct MyContainer<'a, T:'a> {`
`48`	`49`	`foos: Vec<&'a (dyn MyTrait<T>+'a)> ,`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ impl SemiUsedStruct {`
`49`	`49`	`struct StructUsedAsField;`
`50`	`50`	`pub struct StructUsedInEnum;`
`51`	`51`	`struct StructUsedInGeneric;`
	`52`	`+#[allow(dead_code)]`
`52`	`53`	`pub struct PubStruct2 {`
`53`		`- #[allow(dead_code)]`
`54`	`54`	`struct_used_as_field: *const StructUsedAsField`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,23 @@`
`1`	`1`	`error: where clauses are not allowed before tuple struct bodies`
`2`		`- --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:5:1`
	`2`	`+ --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:6:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub struct Example`
`5`	`5`	`\| ------- while parsing this tuple struct`
`6`	`6`	`LL \| / where`
`7`	`7`	`LL \| \| (): Sized,`
`8`	`8`	`\| \|______________^ unexpected where clause`
`9`		`-LL \| (#[allow(dead_code)] usize);`
`10`		`- \| --------------------------- the struct body`
	`9`	`+LL \| (usize);`
	`10`	`+ \| ------- the struct body`
`11`	`11`	`\|`
`12`	`12`	`help: move the body before the where clause`
`13`	`13`	`\|`
`14`		`-LL ~ pub struct Example(#[allow(dead_code)] usize)`
	`14`	`+LL ~ pub struct Example(usize)`
`15`	`15`	`LL \| where`
`16`	`16`	`LL ~ (): Sized;`
`17`	`17`	`\|`
`18`	`18`
`19`	`19`	`error: where clauses are not allowed before tuple struct bodies`
`20`		`- --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:11:1`
	`20`	`+ --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:12:1`
`21`	`21`	`\|`
`22`	`22`	`LL \| struct _Demo`
`23`	`23`	`\| ----- while parsing this tuple struct`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	error: missing `struct` for struct definition
`2`		`- --> $DIR/pub-ident-struct-4.rs:3:4`
	`2`	`+ --> $DIR/pub-ident-struct-4.rs:4:4`
`3`	`3`	`\|`
`4`		`-LL \| pub T(#[allow(dead_code)] String);`
	`4`	`+LL \| pub T(String);`
`5`	`5`	`\| ^`
`6`	`6`	`\|`
`7`	`7`	help: add `struct` here to parse `T` as a public struct
`8`	`8`	`\|`
`9`		`-LL \| pub struct T(#[allow(dead_code)] String);`
	`9`	`+LL \| pub struct T(String);`
`10`	`10`	`\| ++++++`
`11`	`11`
`12`	`12`	`error: aborting due to 1 previous error`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`//@ pretty-expanded FIXME #23616`
`7`	`7`
	`8`	`+#[allow(dead_code)]`
`8`	`9`	`pub struct P<'a> {`
`9`	`10`	`_ptr: *const &'a u8,`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	error[E0277]: the trait bound `T: Clone` is not satisfied
`2`		`- --> $DIR/derive-clone-for-eq.rs:4:17`
	`2`	`+ --> $DIR/derive-clone-for-eq.rs:5:17`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[derive(Clone, Eq)]`
`5`	`5`	\| ^^ the trait `Clone` is not implemented for `T`, which is required by `Struct<T>: PartialEq`
`6`	`6`	`\|`
`7`	`7`	note: required for `Struct<T>` to implement `PartialEq`
`8`		`- --> $DIR/derive-clone-for-eq.rs:7:19`
	`8`	`+ --> $DIR/derive-clone-for-eq.rs:8:19`
`9`	`9`	`\|`
`10`	`10`	`LL \| impl<T: Clone, U> PartialEq<U> for Struct<T>`
`11`	`11`	`\| ----- ^^^^^^^^^^^^ ^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`//@ run-rustfix`
	`2`	`+#[allow(dead_code)]`
`2`	`3`	`pub struct LipogramCorpora {`
`3`	`4`	`selections: Vec<(char, Option<String>)>,`
`4`	`5`	`}`
`@@ -17,6 +18,7 @@ impl LipogramCorpora {`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`
	`21`	`+#[allow(dead_code)]`
`20`	`22`	`pub struct LipogramCorpora2 {`
`21`	`23`	`selections: Vec<(char, Result<String, String>)>,`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0507]: cannot move out of `selection.1` which is behind a shared reference
`2`		`- --> $DIR/option-content-move.rs:10:20`
	`2`	`+ --> $DIR/option-content-move.rs:11:20`
`3`	`3`	`\|`
`4`	`4`	`LL \| if selection.1.unwrap().contains(selection.0) {`
`5`	`5`	\| ^^^^^^^^^^^ -------- `selection.1` moved due to this method call
`@@ -19,7 +19,7 @@ LL \| if selection.1.clone().unwrap().contains(selection.0) {`
`19`	`19`	`\| ++++++++`
`20`	`20`
`21`	`21`	error[E0507]: cannot move out of `selection.1` which is behind a shared reference
`22`		`- --> $DIR/option-content-move.rs:28:20`
	`22`	`+ --> $DIR/option-content-move.rs:30:20`
`23`	`23`	`\|`
`24`	`24`	`LL \| if selection.1.unwrap().contains(selection.0) {`
`25`	`25`	\| ^^^^^^^^^^^ -------- `selection.1` moved due to this method call
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ pub trait Trait2<A> {`
`7`	`7`	`fn doit(&self) -> A;`
`8`	`8`	`}`
`9`	`9`
	`10`	`+#[allow(dead_code)]`
`10`	`11`	`pub struct Impl<A1, A2, A3> {`
`11`	`12`	`m1: marker::PhantomData<(A1,A2,A3)>,`
`12`	`13`	`/*`