diff options
| author | bors <bors@rust-lang.org> | 2018-09-10 01:42:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-10 01:42:11 +0000 |
| commit | fdcd4a4a45357f11343d5abe9501a35793a6fd57 (patch) | |
| tree | 4955df12077b6eca0786ad0604dc640a80e0255c /src/libsyntax | |
| parent | 2d4e34ca8bb1369f7e0eea4cb50e6faa0827a6e5 (diff) | |
| parent | 62c7d78a9a39688e6445aefbd4fe1d051b7a9886 (diff) | |
| download | rust-fdcd4a4a45357f11343d5abe9501a35793a6fd57.tar.gz rust-fdcd4a4a45357f11343d5abe9501a35793a6fd57.zip | |
Auto merge of #53936 - petrochenkov:2macpre, r=alexcrichton
resolve: Split macro prelude into built-in and user-defined parts This is a refactoring that will help to remove `unshadowable_attrs` when https://github.com/rust-lang/rust/pull/53410 lands. UPDATE: The second commit actually removes `unshadowable_attrs`.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 0e059bc4a6c..1ea71009766 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -721,7 +721,6 @@ pub trait Resolver { fn visit_ast_fragment_with_placeholders(&mut self, mark: Mark, fragment: &AstFragment, derives: &[Mark]); fn add_builtin(&mut self, ident: ast::Ident, ext: Lrc<SyntaxExtension>); - fn add_unshadowable_attr(&mut self, ident: ast::Ident, ext: Lrc<SyntaxExtension>); fn resolve_imports(&mut self); // Resolves attribute and derive legacy macros from `#![plugin(..)]`. @@ -761,7 +760,6 @@ impl Resolver for DummyResolver { fn visit_ast_fragment_with_placeholders(&mut self, _invoc: Mark, _fragment: &AstFragment, _derives: &[Mark]) {} fn add_builtin(&mut self, _ident: ast::Ident, _ext: Lrc<SyntaxExtension>) {} - fn add_unshadowable_attr(&mut self, _ident: ast::Ident, _ext: Lrc<SyntaxExtension>) {} fn resolve_imports(&mut self) {} fn find_legacy_attr_invoc(&mut self, _attrs: &mut Vec<Attribute>, _allow_derive: bool) |