diff options
| author | bors <bors@rust-lang.org> | 2013-05-15 16:07:44 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-15 16:07:44 -0700 |
| commit | 7012c42c4155198df282ac4ebf0000cb25fa10f3 (patch) | |
| tree | f370022c046092fb36ee05bf327b6a8025769935 /src/libsyntax | |
| parent | 08b4cdd395264c51db79908b6a5b543f089ae8f7 (diff) | |
| parent | 017df987b8f7877f5be04bc137ea830a9c82343e (diff) | |
| download | rust-7012c42c4155198df282ac4ebf0000cb25fa10f3.tar.gz rust-7012c42c4155198df282ac4ebf0000cb25fa10f3.zip | |
auto merge of #6500 : kud1ing/rust/cleanup, r=bstrie
Fixes #6445
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 9 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/clone.rs | 9 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/cmp/eq.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/iter_bytes.rs | 10 |
4 files changed, 0 insertions, 36 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 30470d2ebe7..51e127ab60f 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -148,15 +148,6 @@ pub fn syntax_expander_table() -> SyntaxEnv { syntax_expanders.insert(@~"deriving", @SE(ItemDecorator( ext::deriving::expand_meta_deriving))); - syntax_expanders.insert(@~"deriving_eq", - @SE(ItemDecorator( - ext::deriving::eq::expand_deriving_obsolete))); - syntax_expanders.insert(@~"deriving_iter_bytes", - @SE(ItemDecorator( - ext::deriving::iter_bytes::expand_deriving_obsolete))); - syntax_expanders.insert(@~"deriving_clone", - @SE(ItemDecorator( - ext::deriving::clone::expand_deriving_obsolete))); // Quasi-quoting expanders syntax_expanders.insert(@~"quote_tokens", diff --git a/src/libsyntax/ext/deriving/clone.rs b/src/libsyntax/ext/deriving/clone.rs index 1a45107c267..e2d6685ec65 100644 --- a/src/libsyntax/ext/deriving/clone.rs +++ b/src/libsyntax/ext/deriving/clone.rs @@ -42,15 +42,6 @@ pub fn expand_deriving_clone(cx: @ext_ctxt, &trait_def) } -pub fn expand_deriving_obsolete(cx: @ext_ctxt, - span: span, - _mitem: @meta_item, - in_items: ~[@item]) - -> ~[@item] { - cx.span_err(span, ~"`#[deriving_clone]` is obsolete; use `#[deriving(Clone)]` instead"); - in_items -} - fn cs_clone(cx: @ext_ctxt, span: span, substr: &Substructure) -> @expr { let clone_ident = substr.method_ident; diff --git a/src/libsyntax/ext/deriving/cmp/eq.rs b/src/libsyntax/ext/deriving/cmp/eq.rs index 7fc2fdc7963..3d93f844ea3 100644 --- a/src/libsyntax/ext/deriving/cmp/eq.rs +++ b/src/libsyntax/ext/deriving/cmp/eq.rs @@ -56,11 +56,3 @@ pub fn expand_deriving_eq(cx: @ext_ctxt, expand_deriving_generic(cx, span, mitem, in_items, &trait_def) } - -pub fn expand_deriving_obsolete(cx: @ext_ctxt, - span: span, - _mitem: @meta_item, - in_items: ~[@item]) -> ~[@item] { - cx.span_err(span, ~"`#[deriving_eq]` is obsolete; use `#[deriving(Eq)]` instead"); - in_items -} diff --git a/src/libsyntax/ext/deriving/iter_bytes.rs b/src/libsyntax/ext/deriving/iter_bytes.rs index 27e3a54add5..1c9ec6ece2e 100644 --- a/src/libsyntax/ext/deriving/iter_bytes.rs +++ b/src/libsyntax/ext/deriving/iter_bytes.rs @@ -41,16 +41,6 @@ pub fn expand_deriving_iter_bytes(cx: @ext_ctxt, expand_deriving_generic(cx, span, mitem, in_items, &trait_def) } -pub fn expand_deriving_obsolete(cx: @ext_ctxt, - span: span, - _mitem: @meta_item, - in_items: ~[@item]) - -> ~[@item] { - cx.span_err(span, ~"`#[deriving_iter_bytes]` is obsolete; use `#[deriving(IterBytes)]` \ - instead"); - in_items -} - fn iter_bytes_substructure(cx: @ext_ctxt, span: span, substr: &Substructure) -> @expr { let lsb0_f = match substr.nonself_args { [l, f] => ~[l, f], |