rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #17338 : nick29581/variants-namespace

Browse Source
This commit is contained in:
Alex Crichton
2014-09-19 10:00:29 -07:00
parent 81ee3586b5 ce0907e46e
commit 04f5fe5a08
72 changed files with 489 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsyntax/ext/base.rs
View File

@@ -299,11 +299,11 @@ pub enum SyntaxExtension {
/// based upon it.
///
/// `#[deriving(...)]` is an `ItemDecorator`.
ItemDecorator(Box<ItemDecorator + 'static>),
Decorator(Box<ItemDecorator + 'static>),
/// A syntax extension that is attached to an item and modifies it
/// in-place.
ItemModifier(Box<ItemModifier + 'static>),
Modifier(Box<ItemModifier + 'static>),
/// A normal, function-like syntax extension.
///
@@ -381,7 +381,7 @@ fn initial_syntax_expander_table() -> SyntaxEnv {
builtin_normal_expander(
ext::log_syntax::expand_syntax_ext));
syntax_expanders.insert(intern("deriving"),
ItemDecorator(box ext::deriving::expand_meta_deriving));
Decorator(box ext::deriving::expand_meta_deriving));
// Quasi-quoting expanders
syntax_expanders.insert(intern("quote_tokens"),