Skip to content

Commit 76490f7

Browse files
authored
Merge pull request #413 from dtolnay/elidablelifetime
Clippy elidable_lifetime_names lint
2 parents 5f07160 + 9f27b76 commit 76490f7

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

impl/src/expand.rs

+12-2
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,12 @@ fn impl_struct(input: Struct) -> TokenStream {
181181
}
182182
};
183183
Some(quote! {
184-
#[allow(deprecated, unused_qualifications, clippy::needless_lifetimes)]
184+
#[allow(
185+
deprecated,
186+
unused_qualifications,
187+
clippy::elidable_lifetime_names,
188+
clippy::needless_lifetimes,
189+
)]
185190
#from_impl
186191
})
187192
});
@@ -451,7 +456,12 @@ fn impl_enum(input: Enum) -> TokenStream {
451456
}
452457
};
453458
Some(quote! {
454-
#[allow(deprecated, unused_qualifications, clippy::needless_lifetimes)]
459+
#[allow(
460+
deprecated,
461+
unused_qualifications,
462+
clippy::elidable_lifetime_names,
463+
clippy::needless_lifetimes,
464+
)]
455465
#from_impl
456466
})
457467
});

src/aserror.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl<'a> AsDynError<'a> for dyn Error + Send + Sync + UnwindSafe + 'a {
4444
#[doc(hidden)]
4545
pub trait Sealed {}
4646
impl<T: Error> Sealed for T {}
47-
impl<'a> Sealed for dyn Error + 'a {}
48-
impl<'a> Sealed for dyn Error + Send + 'a {}
49-
impl<'a> Sealed for dyn Error + Send + Sync + 'a {}
50-
impl<'a> Sealed for dyn Error + Send + Sync + UnwindSafe + 'a {}
47+
impl Sealed for dyn Error + '_ {}
48+
impl Sealed for dyn Error + Send + '_ {}
49+
impl Sealed for dyn Error + Send + Sync + '_ {}
50+
impl Sealed for dyn Error + Send + Sync + UnwindSafe + '_ {}

src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@
259259
#![no_std]
260260
#![doc(html_root_url = "https://docs.rs/thiserror/2.0.11")]
261261
#![allow(
262+
clippy::elidable_lifetime_names,
262263
clippy::module_name_repetitions,
263264
clippy::needless_lifetimes,
264265
clippy::return_self_not_must_use,

tests/test_display.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![allow(
2+
clippy::elidable_lifetime_names,
23
clippy::needless_lifetimes,
34
clippy::needless_raw_string_hashes,
45
clippy::trivially_copy_pass_by_ref,

tests/test_lints.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn test_unused_qualifications() {
3333
#[test]
3434
fn test_needless_lifetimes() {
3535
#![allow(dead_code)]
36-
#![deny(clippy::needless_lifetimes)]
36+
#![deny(clippy::elidable_lifetime_names, clippy::needless_lifetimes)]
3737

3838
#[derive(Error, Debug)]
3939
#[error("...")]

0 commit comments

Comments
 (0)