diff options
| author | bors <bors@rust-lang.org> | 2016-07-06 11:13:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 11:13:48 -0700 |
| commit | 34c9cddc89573131d9691309cb2425d7db1ddc6e (patch) | |
| tree | 740fe0d5f09b603f9a740094edd97d234f2c0f5b /src/libsyntax/ext | |
| parent | 4114b68eba6914b46202a2108f34f7653e393851 (diff) | |
| parent | bf4911b9560a20d1861627a2db3de33843f964b1 (diff) | |
| download | rust-34c9cddc89573131d9691309cb2425d7db1ddc6e.tar.gz rust-34c9cddc89573131d9691309cb2425d7db1ddc6e.zip | |
Auto merge of #34654 - jseyfried:configure_multi_modified, r=nrc
Perform `cfg` attribute processing on `MultiModifier`-generated items Fixes https://users.rust-lang.org/t/unused-attribute-warning-for-custom-derive-attribute/6180. r? @nrc
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index c670283e559..877293bac54 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -769,7 +769,11 @@ fn expand_annotatable(mut item: Annotatable, fld: &mut MacroExpander) -> SmallVe }; fld.cx.bt_pop(); - modified.into_iter().flat_map(|it| expand_annotatable(it, fld)).collect() + let configured = modified.into_iter().flat_map(|it| { + it.fold_with(&mut fld.strip_unconfigured()) + }).collect::<SmallVector<_>>(); + + configured.into_iter().flat_map(|it| expand_annotatable(it, fld)).collect() } } } |
