Permalink
Browse files

auto merge of #6500 : kud1ing/rust/cleanup, r=bstrie

Fixes #6445
  • Loading branch information...
bors committed May 15, 2013
2 parents 08b4cdd + 017df98 commit 7012c42c4155198df282ac4ebf0000cb25fa10f3
@@ -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",
@@ -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;
@@ -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
}
@@ -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],

This file was deleted.

Oops, something went wrong.

0 comments on commit 7012c42

Please sign in to comment.