rust-lang
diff --git a/‎tests/ui/extra_unused_lifetimes.rs
Lines changed: 7 additions & 1 deletion b/‎tests/ui/extra_unused_lifetimes.rs
Lines changed: 7 additions & 1 deletion
diff --git a/‎tests/ui/extra_unused_lifetimes.stderr
Lines changed: 4 additions & 4 deletions b/‎tests/ui/extra_unused_lifetimes.stderr
Lines changed: 4 additions & 4 deletions
diff --git a/‎tests/ui/len_without_is_empty.rs
Lines changed: 20 additions & 20 deletions b/‎tests/ui/len_without_is_empty.rs
Lines changed: 20 additions & 20 deletions
diff --git a/‎tests/ui/len_without_is_empty.stderr
Lines changed: 4 additions & 4 deletions b/‎tests/ui/len_without_is_empty.stderr
Lines changed: 4 additions & 4 deletions
diff --git a/‎tests/ui/len_zero.fixed
Lines changed: 10 additions & 10 deletions b/‎tests/ui/len_zero.fixed
Lines changed: 10 additions & 10 deletions
diff --git a/‎tests/ui/len_zero.rs
Lines changed: 10 additions & 10 deletions b/‎tests/ui/len_zero.rs
Lines changed: 10 additions & 10 deletions
@@ -1,4 +1,10 @@
-#![allow(unused, dead_code, clippy::needless_lifetimes, clippy::needless_pass_by_value)]
+#![allow(
+    unused,
+    dead_code,
+    clippy::needless_lifetimes,
+    clippy::needless_pass_by_value,
+    clippy::needless_arbitrary_self_type
+)]
 #![warn(clippy::extra_unused_lifetimes)]
 
 fn empty() {}
 
@@ -1,25 +1,25 @@
 error: this lifetime isn't used in the function definition
-  --> $DIR/extra_unused_lifetimes.rs:8:14
+  --> $DIR/extra_unused_lifetimes.rs:14:14
    |
 LL | fn unused_lt<'a>(x: u8) {}
    |              ^^
    |
    = note: `-D clippy::extra-unused-lifetimes` implied by `-D warnings`
 
 error: this lifetime isn't used in the function definition
-  --> $DIR/extra_unused_lifetimes.rs:10:25
+  --> $DIR/extra_unused_lifetimes.rs:16:25
    |
 LL | fn unused_lt_transitive<'a, 'b: 'a>(x: &'b u8) {
    |                         ^^
 
 error: this lifetime isn't used in the function definition
-  --> $DIR/extra_unused_lifetimes.rs:35:10
+  --> $DIR/extra_unused_lifetimes.rs:41:10
    |
 LL |     fn x<'a>(&self) {}
    |          ^^
 
 error: this lifetime isn't used in the function definition
-  --> $DIR/extra_unused_lifetimes.rs:61:22
+  --> $DIR/extra_unused_lifetimes.rs:67:22
    |
 LL |         fn unused_lt<'a>(x: u8) {}
    |                      ^^
 
@@ -4,14 +4,14 @@
 pub struct PubOne;
 
 impl PubOne {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 }
 
 impl PubOne {
     // A second impl for this struct -- the error span shouldn't mention this.
-    pub fn irrelevant(self: &Self) -> bool {
+    pub fn irrelevant(&self) -> bool {
         false
     }
 }
@@ -21,57 +21,57 @@ pub struct PubAllowed;
 
 #[allow(clippy::len_without_is_empty)]
 impl PubAllowed {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 }
 
 // No `allow` attribute on this impl block, but that doesn't matter -- we only require one on the
 // impl containing `len`.
 impl PubAllowed {
-    pub fn irrelevant(self: &Self) -> bool {
+    pub fn irrelevant(&self) -> bool {
         false
     }
 }
 
 pub trait PubTraitsToo {
-    fn len(self: &Self) -> isize;
+    fn len(&self) -> isize;
 }
 
 impl PubTraitsToo for One {
-    fn len(self: &Self) -> isize {
+    fn len(&self) -> isize {
         0
     }
 }
 
 pub struct HasIsEmpty;
 
 impl HasIsEmpty {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 
-    fn is_empty(self: &Self) -> bool {
+    fn is_empty(&self) -> bool {
         false
     }
 }
 
 pub struct HasWrongIsEmpty;
 
 impl HasWrongIsEmpty {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 
-    pub fn is_empty(self: &Self, x: u32) -> bool {
+    pub fn is_empty(&self, x: u32) -> bool {
         false
     }
 }
 
 struct NotPubOne;
 
 impl NotPubOne {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         // No error; `len` is pub but `NotPubOne` is not exported anyway.
         1
     }
@@ -80,48 +80,48 @@ impl NotPubOne {
 struct One;
 
 impl One {
-    fn len(self: &Self) -> isize {
+    fn len(&self) -> isize {
         // No error; `len` is private; see issue #1085.
         1
     }
 }
 
 trait TraitsToo {
-    fn len(self: &Self) -> isize;
+    fn len(&self) -> isize;
     // No error; `len` is private; see issue #1085.
 }
 
 impl TraitsToo for One {
-    fn len(self: &Self) -> isize {
+    fn len(&self) -> isize {
         0
     }
 }
 
 struct HasPrivateIsEmpty;
 
 impl HasPrivateIsEmpty {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 
-    fn is_empty(self: &Self) -> bool {
+    fn is_empty(&self) -> bool {
         false
     }
 }
 
 struct Wither;
 
 pub trait WithIsEmpty {
-    fn len(self: &Self) -> isize;
-    fn is_empty(self: &Self) -> bool;
+    fn len(&self) -> isize;
+    fn is_empty(&self) -> bool;
 }
 
 impl WithIsEmpty for Wither {
-    fn len(self: &Self) -> isize {
+    fn len(&self) -> isize {
         1
     }
 
-    fn is_empty(self: &Self) -> bool {
+    fn is_empty(&self) -> bool {
         false
     }
 }
 
@@ -2,7 +2,7 @@ error: item `PubOne` has a public `len` method but no corresponding `is_empty` m
   --> $DIR/len_without_is_empty.rs:6:1
    |
 LL | / impl PubOne {
-LL | |     pub fn len(self: &Self) -> isize {
+LL | |     pub fn len(&self) -> isize {
 LL | |         1
 LL | |     }
 LL | | }
@@ -14,15 +14,15 @@ error: trait `PubTraitsToo` has a `len` method but no (possibly inherited) `is_e
   --> $DIR/len_without_is_empty.rs:37:1
    |
 LL | / pub trait PubTraitsToo {
-LL | |     fn len(self: &Self) -> isize;
+LL | |     fn len(&self) -> isize;
 LL | | }
    | |_^
 
 error: item `HasIsEmpty` has a public `len` method but a private `is_empty` method
   --> $DIR/len_without_is_empty.rs:49:1
    |
 LL | / impl HasIsEmpty {
-LL | |     pub fn len(self: &Self) -> isize {
+LL | |     pub fn len(&self) -> isize {
 LL | |         1
 LL | |     }
 ...  |
@@ -34,7 +34,7 @@ error: item `HasWrongIsEmpty` has a public `len` method but no corresponding `is
   --> $DIR/len_without_is_empty.rs:61:1
    |
 LL | / impl HasWrongIsEmpty {
-LL | |     pub fn len(self: &Self) -> isize {
+LL | |     pub fn len(&self) -> isize {
 LL | |         1
 LL | |     }
 ...  |
 
@@ -7,51 +7,51 @@ pub struct One;
 struct Wither;
 
 trait TraitsToo {
-    fn len(self: &Self) -> isize;
+    fn len(&self) -> isize;
     // No error; `len` is private; see issue #1085.
 }
 
 impl TraitsToo for One {
-    fn len(self: &Self) -> isize {
+    fn len(&self) -> isize {
         0
     }
 }
 
 pub struct HasIsEmpty;
 
 impl HasIsEmpty {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 
-    fn is_empty(self: &Self) -> bool {
+    fn is_empty(&self) -> bool {
         false
     }
 }
 
 pub struct HasWrongIsEmpty;
 
 impl HasWrongIsEmpty {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 
-    pub fn is_empty(self: &Self, x: u32) -> bool {
+    pub fn is_empty(&self, x: u32) -> bool {
         false
     }
 }
 
 pub trait WithIsEmpty {
-    fn len(self: &Self) -> isize;
-    fn is_empty(self: &Self) -> bool;
+    fn len(&self) -> isize;
+    fn is_empty(&self) -> bool;
 }
 
 impl WithIsEmpty for Wither {
-    fn len(self: &Self) -> isize {
+    fn len(&self) -> isize {
         1
     }
 
-    fn is_empty(self: &Self) -> bool {
+    fn is_empty(&self) -> bool {
         false
     }
 }
 
@@ -7,51 +7,51 @@ pub struct One;
 struct Wither;
 
 trait TraitsToo {
-    fn len(self: &Self) -> isize;
+    fn len(&self) -> isize;
     // No error; `len` is private; see issue #1085.
 }
 
 impl TraitsToo for One {
-    fn len(self: &Self) -> isize {
+    fn len(&self) -> isize {
         0
     }
 }
 
 pub struct HasIsEmpty;
 
 impl HasIsEmpty {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 
-    fn is_empty(self: &Self) -> bool {
+    fn is_empty(&self) -> bool {
         false
     }
 }
 
 pub struct HasWrongIsEmpty;
 
 impl HasWrongIsEmpty {
-    pub fn len(self: &Self) -> isize {
+    pub fn len(&self) -> isize {
         1
     }
 
-    pub fn is_empty(self: &Self, x: u32) -> bool {
+    pub fn is_empty(&self, x: u32) -> bool {
         false
     }
 }
 
 pub trait WithIsEmpty {
-    fn len(self: &Self) -> isize;
-    fn is_empty(self: &Self) -> bool;
+    fn len(&self) -> isize;
+    fn is_empty(&self) -> bool;
 }
 
 impl WithIsEmpty for Wither {
-    fn len(self: &Self) -> isize {
+    fn len(&self) -> isize {
         1
     }
 
-    fn is_empty(self: &Self) -> bool {
+    fn is_empty(&self) -> bool {
         false
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -1,25 +1,25 @@`
`1`	`1`	`error: this lifetime isn't used in the function definition`
`2`		`- --> $DIR/extra_unused_lifetimes.rs:8:14`
	`2`	`+ --> $DIR/extra_unused_lifetimes.rs:14:14`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn unused_lt<'a>(x: u8) {}`
`5`	`5`	`\| ^^`
`6`	`6`	`\|`
`7`	`7`	= note: `-D clippy::extra-unused-lifetimes` implied by `-D warnings`
`8`	`8`
`9`	`9`	`error: this lifetime isn't used in the function definition`
`10`		`- --> $DIR/extra_unused_lifetimes.rs:10:25`
	`10`	`+ --> $DIR/extra_unused_lifetimes.rs:16:25`
`11`	`11`	`\|`
`12`	`12`	`LL \| fn unused_lt_transitive<'a, 'b: 'a>(x: &'b u8) {`
`13`	`13`	`\| ^^`
`14`	`14`
`15`	`15`	`error: this lifetime isn't used in the function definition`
`16`		`- --> $DIR/extra_unused_lifetimes.rs:35:10`
	`16`	`+ --> $DIR/extra_unused_lifetimes.rs:41:10`
`17`	`17`	`\|`
`18`	`18`	`LL \| fn x<'a>(&self) {}`
`19`	`19`	`\| ^^`
`20`	`20`
`21`	`21`	`error: this lifetime isn't used in the function definition`
`22`		`- --> $DIR/extra_unused_lifetimes.rs:61:22`
	`22`	`+ --> $DIR/extra_unused_lifetimes.rs:67:22`
`23`	`23`	`\|`
`24`	`24`	`LL \| fn unused_lt<'a>(x: u8) {}`
`25`	`25`	`\| ^^`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`	`pub struct PubOne;`
`5`	`5`
`6`	`6`	`impl PubOne {`
`7`		`- pub fn len(self: &Self) -> isize {`
	`7`	`+ pub fn len(&self) -> isize {`
`8`	`8`	`1`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`impl PubOne {`
`13`	`13`	`// A second impl for this struct -- the error span shouldn't mention this.`
`14`		`- pub fn irrelevant(self: &Self) -> bool {`
	`14`	`+ pub fn irrelevant(&self) -> bool {`
`15`	`15`	`false`
`16`	`16`	`}`
`17`	`17`	`}`
`@@ -21,57 +21,57 @@ pub struct PubAllowed;`
`21`	`21`
`22`	`22`	`#[allow(clippy::len_without_is_empty)]`
`23`	`23`	`impl PubAllowed {`
`24`		`- pub fn len(self: &Self) -> isize {`
	`24`	`+ pub fn len(&self) -> isize {`
`25`	`25`	`1`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	// No `allow` attribute on this impl block, but that doesn't matter -- we only require one on the
`30`	`30`	// impl containing `len`.
`31`	`31`	`impl PubAllowed {`
`32`		`- pub fn irrelevant(self: &Self) -> bool {`
	`32`	`+ pub fn irrelevant(&self) -> bool {`
`33`	`33`	`false`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`pub trait PubTraitsToo {`
`38`		`- fn len(self: &Self) -> isize;`
	`38`	`+ fn len(&self) -> isize;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`impl PubTraitsToo for One {`
`42`		`- fn len(self: &Self) -> isize {`
	`42`	`+ fn len(&self) -> isize {`
`43`	`43`	`0`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`pub struct HasIsEmpty;`
`48`	`48`
`49`	`49`	`impl HasIsEmpty {`
`50`		`- pub fn len(self: &Self) -> isize {`
	`50`	`+ pub fn len(&self) -> isize {`
`51`	`51`	`1`
`52`	`52`	`}`
`53`	`53`
`54`		`- fn is_empty(self: &Self) -> bool {`
	`54`	`+ fn is_empty(&self) -> bool {`
`55`	`55`	`false`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`pub struct HasWrongIsEmpty;`
`60`	`60`
`61`	`61`	`impl HasWrongIsEmpty {`
`62`		`- pub fn len(self: &Self) -> isize {`
	`62`	`+ pub fn len(&self) -> isize {`
`63`	`63`	`1`
`64`	`64`	`}`
`65`	`65`
`66`		`- pub fn is_empty(self: &Self, x: u32) -> bool {`
	`66`	`+ pub fn is_empty(&self, x: u32) -> bool {`
`67`	`67`	`false`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`struct NotPubOne;`
`72`	`72`
`73`	`73`	`impl NotPubOne {`
`74`		`- pub fn len(self: &Self) -> isize {`
	`74`	`+ pub fn len(&self) -> isize {`
`75`	`75`	// No error; `len` is pub but `NotPubOne` is not exported anyway.
`76`	`76`	`1`
`77`	`77`	`}`
`@@ -80,48 +80,48 @@ impl NotPubOne {`
`80`	`80`	`struct One;`
`81`	`81`
`82`	`82`	`impl One {`
`83`		`- fn len(self: &Self) -> isize {`
	`83`	`+ fn len(&self) -> isize {`
`84`	`84`	// No error; `len` is private; see issue #1085.
`85`	`85`	`1`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`trait TraitsToo {`
`90`		`- fn len(self: &Self) -> isize;`
	`90`	`+ fn len(&self) -> isize;`
`91`	`91`	// No error; `len` is private; see issue #1085.
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`impl TraitsToo for One {`
`95`		`- fn len(self: &Self) -> isize {`
	`95`	`+ fn len(&self) -> isize {`
`96`	`96`	`0`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`struct HasPrivateIsEmpty;`
`101`	`101`
`102`	`102`	`impl HasPrivateIsEmpty {`
`103`		`- pub fn len(self: &Self) -> isize {`
	`103`	`+ pub fn len(&self) -> isize {`
`104`	`104`	`1`
`105`	`105`	`}`
`106`	`106`
`107`		`- fn is_empty(self: &Self) -> bool {`
	`107`	`+ fn is_empty(&self) -> bool {`
`108`	`108`	`false`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`struct Wither;`
`113`	`113`
`114`	`114`	`pub trait WithIsEmpty {`
`115`		`- fn len(self: &Self) -> isize;`
`116`		`- fn is_empty(self: &Self) -> bool;`
	`115`	`+ fn len(&self) -> isize;`
	`116`	`+ fn is_empty(&self) -> bool;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`impl WithIsEmpty for Wither {`
`120`		`- fn len(self: &Self) -> isize {`
	`120`	`+ fn len(&self) -> isize {`
`121`	`121`	`1`
`122`	`122`	`}`
`123`	`123`
`124`		`- fn is_empty(self: &Self) -> bool {`
	`124`	`+ fn is_empty(&self) -> bool {`
`125`	`125`	`false`
`126`	`126`	`}`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,51 +7,51 @@ pub struct One;`
`7`	`7`	`struct Wither;`
`8`	`8`
`9`	`9`	`trait TraitsToo {`
`10`		`- fn len(self: &Self) -> isize;`
	`10`	`+ fn len(&self) -> isize;`
`11`	`11`	// No error; `len` is private; see issue #1085.
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`impl TraitsToo for One {`
`15`		`- fn len(self: &Self) -> isize {`
	`15`	`+ fn len(&self) -> isize {`
`16`	`16`	`0`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`pub struct HasIsEmpty;`
`21`	`21`
`22`	`22`	`impl HasIsEmpty {`
`23`		`- pub fn len(self: &Self) -> isize {`
	`23`	`+ pub fn len(&self) -> isize {`
`24`	`24`	`1`
`25`	`25`	`}`
`26`	`26`
`27`		`- fn is_empty(self: &Self) -> bool {`
	`27`	`+ fn is_empty(&self) -> bool {`
`28`	`28`	`false`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`pub struct HasWrongIsEmpty;`
`33`	`33`
`34`	`34`	`impl HasWrongIsEmpty {`
`35`		`- pub fn len(self: &Self) -> isize {`
	`35`	`+ pub fn len(&self) -> isize {`
`36`	`36`	`1`
`37`	`37`	`}`
`38`	`38`
`39`		`- pub fn is_empty(self: &Self, x: u32) -> bool {`
	`39`	`+ pub fn is_empty(&self, x: u32) -> bool {`
`40`	`40`	`false`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`pub trait WithIsEmpty {`
`45`		`- fn len(self: &Self) -> isize;`
`46`		`- fn is_empty(self: &Self) -> bool;`
	`45`	`+ fn len(&self) -> isize;`
	`46`	`+ fn is_empty(&self) -> bool;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`impl WithIsEmpty for Wither {`
`50`		`- fn len(self: &Self) -> isize {`
	`50`	`+ fn len(&self) -> isize {`
`51`	`51`	`1`
`52`	`52`	`}`
`53`	`53`
`54`		`- fn is_empty(self: &Self) -> bool {`
	`54`	`+ fn is_empty(&self) -> bool {`
`55`	`55`	`false`
`56`	`56`	`}`
`57`	`57`	`}`