diff options
| author | bors <bors@rust-lang.org> | 2019-03-25 12:21:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-25 12:21:46 +0000 |
| commit | d91b32b4dc9db066ab7deedbc51dc62ba597524b (patch) | |
| tree | a365dc02925877c979e93aed911e26d2e3e0169e /src/libsyntax_ext | |
| parent | 3f36ac4e835dfa0af77d5261a444a674ec9da3a5 (diff) | |
| parent | db74efce69711fcee03d3338afcbca67c27ceee8 (diff) | |
| download | rust-d91b32b4dc9db066ab7deedbc51dc62ba597524b.tar.gz rust-d91b32b4dc9db066ab7deedbc51dc62ba597524b.zip | |
Auto merge of #59256 - petrochenkov:derval2, r=Zoxc
Make meta-item API compatible with `LocalInternedString::get` soundness fix r? @Zoxc
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index dc0d72a7830..e5939e396e5 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -463,9 +463,10 @@ impl<'a> TraitDef<'a> { let mut attrs = newitem.attrs.clone(); attrs.extend(item.attrs .iter() - .filter(|a| a.ident_str().map_or(false, |name| { - ["allow", "warn", "deny", "forbid", "stable", "unstable"].contains(&name) - })) + .filter(|a| { + ["allow", "warn", "deny", "forbid", "stable", "unstable"] + .contains(&a.name_or_empty().get()) + }) .cloned()); push(Annotatable::Item(P(ast::Item { attrs: attrs, ..(*newitem).clone() }))) } |