Merge pull request #396 from dtolnay/deprecatedfrom

Suppress deprecation warning on generated From impls
dtolnay · Dec 8, 2024 · e9a9085 · e9a9085
2 parents f1f159d + 6e8c724
commit e9a9085
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/impl/src/expand.rs b/impl/src/expand.rs
@@ -170,10 +170,9 @@ fn impl_struct(input: Struct) -> TokenStream {
         let source_var = Ident::new("source", span);
         let body = from_initializer(from_field, backtrace_field, &source_var);
         quote_spanned! {span=>
-            #[allow(unused_qualifications, clippy::needless_lifetimes)]
+            #[allow(deprecated, unused_qualifications, clippy::needless_lifetimes)]
             #[automatically_derived]
             impl #impl_generics ::core::convert::From<#from> for #ty #ty_generics #where_clause {
-                #[allow(deprecated)]
                 fn from(#source_var: #from) -> Self {
                     #ty #body
                 }
@@ -435,10 +434,9 @@ fn impl_enum(input: Enum) -> TokenStream {
         let source_var = Ident::new("source", span);
         let body = from_initializer(from_field, backtrace_field, &source_var);
         Some(quote_spanned! {span=>
-            #[allow(unused_qualifications, clippy::needless_lifetimes)]
+            #[allow(deprecated, unused_qualifications, clippy::needless_lifetimes)]
             #[automatically_derived]
             impl #impl_generics ::core::convert::From<#from> for #ty #ty_generics #where_clause {
-                #[allow(deprecated)]
                 fn from(#source_var: #from) -> Self {
                     #ty::#variant #body
                 }

diff --git a/tests/test_lints.rs b/tests/test_lints.rs
@@ -64,6 +64,16 @@ fn test_deprecated() {
         Variant,
     }
 
+    #[derive(Error, Debug)]
+    pub enum DeprecatedFrom {
+        #[error(transparent)]
+        Variant(
+            #[from]
+            #[allow(deprecated)]
+            DeprecatedStruct,
+        ),
+    }
+
     #[allow(deprecated)]
     let _: DeprecatedStruct;
     #[allow(deprecated)]