Merge pull request #30 from kas-gui/work2

Fix autoimpl for traits: copy cfg attrs for trait items

Author: dhardy

CHANGELOG.md

@@ -2,6 +2,10 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.2], `impl-tools-lib` [0.7.1] — 2022-12-16
+
+-   Fix `#[autoimpl]` on traits: copy `#[cfg(..)]` attributes (#30)
+
 ## [0.6.1], `impl-tools-lib` [0.7.0] — 2022-12-01
 
 -   Better diagnostics for trait-redefinition: require `Deref` bound (#28)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "impl-tools"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Diggory Hardy <git@dhardy.name>"]
 edition = "2021"
 license = "MIT/Apache-2.0"
@@ -21,7 +21,7 @@ proc-macro-error = "1.0"
 version = "1.0.14"
 
 [dependencies.impl-tools-lib]
-version = "0.7.0"
+version = "0.7.1"
 path = "lib"
 
 [dev-dependencies]

lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "impl-tools-lib"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Diggory Hardy <git@dhardy.name>"]
 edition = "2021"
 license = "MIT/Apache-2.0"

lib/src/for_deref.rs

@@ -181,6 +181,12 @@ impl ForDeref {
         for item in &trait_def.items {
             match item {
                 TraitItem::Const(item) => {
+                    for attr in item.attrs.iter() {
+                        if attr.path == parse_quote! { cfg } {
+                            attr.to_tokens(tokens);
+                        }
+                    }
+
                     item.const_token.to_tokens(tokens);
                     item.ident.to_tokens(tokens);
                     item.colon_token.to_tokens(tokens);
@@ -194,6 +200,12 @@ impl ForDeref {
                     item.semi_token.to_tokens(tokens);
                 }
                 TraitItem::Method(item) => {
+                    for attr in item.attrs.iter() {
+                        if attr.path == parse_quote! { cfg } {
+                            attr.to_tokens(tokens);
+                        }
+                    }
+
                     if has_bound_on_self(&item.sig.generics) {
                         // If the method has a bound on Self, we cannot use a dereferencing
                         // implementation since the definitive type is not guaranteed to match
@@ -242,6 +254,12 @@ impl ForDeref {
                     } });
                 }
                 TraitItem::Type(item) => {
+                    for attr in item.attrs.iter() {
+                        if attr.path == parse_quote! { cfg } {
+                            attr.to_tokens(tokens);
+                        }
+                    }
+
                     if has_bound_on_self(&item.generics) {
                         emit_call_site_error!(
                             "cannot autoimpl trait with Deref";

tests/for_deref.rs

@@ -144,3 +144,12 @@ fn custom_deref_target() {
     z.increment();
     assert_eq!(y, 12);
 }
+
+#[autoimpl(for<T: trait + ?Sized> &T)]
+trait Cfgs {
+    #[cfg(test)]
+    fn included(&self);
+
+    #[cfg(feature = "never")]
+    fn excluded(&self);
+}