Skip to content

Commit

Permalink
Adjust use_self uitest to proper self convention
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgacek8
mgacek8 committed Mar 18, 2021
1 parent ea15fb2 commit 032cdfe
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 31 deletions.
7 changes: 3 additions & 4 deletions tests/ui/use_self.fixed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,13 @@ mod lifetimes {

mod issue2894 {
trait IntoBytes {
fn to_bytes(&self) -> Vec<u8>;
fn to_bytes(self) -> Vec<u8>;
}

// This should not be linted
#[allow(clippy::wrong_self_convention)]
impl IntoBytes for u8 {
fn to_bytes(&self) -> Vec<u8> {
vec![*self]
fn to_bytes(self) -> Vec<u8> {
vec![self]
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions tests/ui/use_self.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,13 @@ mod lifetimes {

mod issue2894 {
trait IntoBytes {
fn to_bytes(&self) -> Vec<u8>;
fn to_bytes(self) -> Vec<u8>;
}

// This should not be linted
#[allow(clippy::wrong_self_convention)]
impl IntoBytes for u8 {
fn to_bytes(&self) -> Vec<u8> {
vec![*self]
fn to_bytes(self) -> Vec<u8> {
vec![self]
}
}
}
Expand Down
46 changes: 23 additions & 23 deletions tests/ui/use_self.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,139 +37,139 @@ LL | Foo::new()
| ^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:94:24
--> $DIR/use_self.rs:93:24
|
LL | fn bad(foos: &[Foo]) -> impl Iterator<Item = &Foo> {
| ^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:94:55
--> $DIR/use_self.rs:93:55
|
LL | fn bad(foos: &[Foo]) -> impl Iterator<Item = &Foo> {
| ^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:109:13
--> $DIR/use_self.rs:108:13
|
LL | TS(0)
| ^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:144:29
--> $DIR/use_self.rs:143:29
|
LL | fn bar() -> Bar {
| ^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:145:21
--> $DIR/use_self.rs:144:21
|
LL | Bar { foo: Foo {} }
| ^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:156:21
--> $DIR/use_self.rs:155:21
|
LL | fn baz() -> Foo {
| ^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:157:13
--> $DIR/use_self.rs:156:13
|
LL | Foo {}
| ^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:174:21
--> $DIR/use_self.rs:173:21
|
LL | let _ = Enum::B(42);
| ^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:175:21
--> $DIR/use_self.rs:174:21
|
LL | let _ = Enum::C { field: true };
| ^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:176:21
--> $DIR/use_self.rs:175:21
|
LL | let _ = Enum::A;
| ^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:218:13
--> $DIR/use_self.rs:217:13
|
LL | nested::A::fun_1();
| ^^^^^^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:219:13
--> $DIR/use_self.rs:218:13
|
LL | nested::A::A;
| ^^^^^^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:221:13
--> $DIR/use_self.rs:220:13
|
LL | nested::A {};
| ^^^^^^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:240:13
--> $DIR/use_self.rs:239:13
|
LL | TestStruct::from_something()
| ^^^^^^^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:254:25
--> $DIR/use_self.rs:253:25
|
LL | async fn g() -> S {
| ^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:255:13
--> $DIR/use_self.rs:254:13
|
LL | S {}
| ^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:259:16
--> $DIR/use_self.rs:258:16
|
LL | &p[S::A..S::B]
| ^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:259:22
--> $DIR/use_self.rs:258:22
|
LL | &p[S::A..S::B]
| ^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:282:29
--> $DIR/use_self.rs:281:29
|
LL | fn foo(value: T) -> Foo<T> {
| ^^^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:283:13
--> $DIR/use_self.rs:282:13
|
LL | Foo { value }
| ^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:320:21
--> $DIR/use_self.rs:319:21
|
LL | type From = T::From;
| ^^^^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:321:19
--> $DIR/use_self.rs:320:19
|
LL | type To = T::To;
| ^^^^^ help: use the applicable keyword: `Self`

error: unnecessary structure name repetition
--> $DIR/use_self.rs:454:13
--> $DIR/use_self.rs:453:13
|
LL | A::new::<submod::B>(submod::B {})
| ^ help: use the applicable keyword: `Self`
Expand Down

0 comments on commit 032cdfe

Please sign in to comment.