diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-23 15:27:06 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-23 15:27:06 -0700 |
| commit | 3112716f123bc0f6f69c4df26894241f41c488ce (patch) | |
| tree | 9719ea02926515843f8db55b0466e648659eeb44 /src/libsyntax/ext | |
| parent | aea822626fef66b6607bc50114b1fb6f8dcd148a (diff) | |
| parent | f945190e6352a1bc965a117569532643319b400f (diff) | |
| download | rust-3112716f123bc0f6f69c4df26894241f41c488ce.tar.gz rust-3112716f123bc0f6f69c4df26894241f41c488ce.zip | |
rollup merge of #23506: alexcrichton/remove-some-deprecated-things
Conflicts: src/test/run-pass/deprecated-no-split-stack.rs
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/deriving/mod.rs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs index 2631c28cf2f..d8c50b5a094 100644 --- a/src/libsyntax/ext/deriving/mod.rs +++ b/src/libsyntax/ext/deriving/mod.rs @@ -78,14 +78,6 @@ pub mod totalord; pub mod generic; -fn expand_deprecated_deriving(cx: &mut ExtCtxt, - span: Span, - _: &MetaItem, - _: &Item, - _: &mut FnMut(P<Item>)) { - cx.span_err(span, "`deriving` has been renamed to `derive`"); -} - fn expand_derive(cx: &mut ExtCtxt, _: Span, mitem: &MetaItem, @@ -151,8 +143,6 @@ macro_rules! derive_traits { env.insert(intern("derive"), Modifier(Box::new(expand_derive))); - env.insert(intern("deriving"), - Decorator(Box::new(expand_deprecated_deriving))); } fn is_builtin_trait(name: &str) -> bool { |