diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-01-26 14:02:23 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-26 15:42:32 -0800 |
| commit | 5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f (patch) | |
| tree | b258f900721206035f33e5fcc229474d19448569 /src/libsyntax/ext/base.rs | |
| parent | d179ba3b8eb65c951b68f6c52da3aba82806a3a1 (diff) | |
| parent | 16286f5cf921a9de463d8a744c33f49837698c3d (diff) | |
| download | rust-5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f.tar.gz rust-5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f.zip | |
Merge remote-tracking branch 'rust-lang/master'
Conflicts: src/librustc/lint/builtin.rs src/librustc/lint/context.rs
Diffstat (limited to 'src/libsyntax/ext/base.rs')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 9cfdc942c21..dd89153d497 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -467,6 +467,8 @@ fn initial_syntax_expander_table(ecfg: &expand::ExpansionConfig) -> SyntaxEnv { ext::log_syntax::expand_syntax_ext)); syntax_expanders.insert(intern("derive"), Decorator(box ext::deriving::expand_meta_derive)); + syntax_expanders.insert(intern("deriving"), + Decorator(box ext::deriving::expand_deprecated_deriving)); if ecfg.enable_quotes { // Quasi-quoting expanders |