---

yaml
---
r: 51331
b: refs/heads/incoming
c: 05c1032
h: refs/heads/master
i:
  51329: 1c6f65c
  51327: dd0a654
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: a9643d39f8243dceb1184f446d988081a607d824
+refs/heads/incoming: 05c103238d977fe8c5d6b614f21f581069373524
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/etc/tidy.py

@@ -5,7 +5,7 @@
 from licenseck import *
 
 err=0
-cols=78
+cols=100
 
 # Be careful to support Python 2.4, 2.6, and 3.x here!
 config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ],

branches/incoming/src/libsyntax/ext/base.rs

@@ -148,9 +148,6 @@ pub fn syntax_expander_table() -> SyntaxEnv {
     syntax_expanders.insert(@~"log_syntax",
                             builtin_normal_tt(
                                 ext::log_syntax::expand_syntax_ext));
-    syntax_expanders.insert(@~"deriving",
-                            @SE(ItemDecorator(
-                                ext::deriving::expand_meta_deriving)));
     syntax_expanders.insert(@~"deriving_eq",
                             @SE(ItemDecorator(
                                 ext::deriving::expand_deriving_eq)));

branches/incoming/src/libsyntax/ext/deriving.rs

@@ -56,48 +56,6 @@ type ExpandDerivingEnumDefFn = &self/fn(ext_ctxt,
                                         ident,
                                         y: &Generics) -> @item;
 
-pub fn expand_meta_deriving(cx: ext_ctxt,
-                            _span: span,
-                            mitem: @meta_item,
-                            in_items: ~[@item])
-                         -> ~[@item] {
-    use ast::{meta_list, meta_name_value, meta_word};
-
-    match mitem.node {
-        meta_name_value(_, l) => {
-            cx.span_err(l.span, ~"unexpected value in `deriving`");
-            in_items
-        }
-        meta_word(_) | meta_list(_, []) => {
-            cx.span_warn(mitem.span, ~"empty trait list in `deriving`");
-            in_items
-        }
-        meta_list(_, titems) => {
-            do titems.foldr(in_items) |&titem, in_items| {
-                match titem.node {
-                    meta_name_value(tname, _) |
-                    meta_list(tname, _) |
-                    meta_word(tname) => {
-                        match *tname {
-                            ~"Clone" => expand_deriving_clone(cx,
-                                titem.span, titem, in_items),
-                            ~"Eq" => expand_deriving_eq(cx, titem.span,
-                                titem, in_items),
-                            ~"IterBytes" => expand_deriving_iter_bytes(cx,
-                                titem.span, titem, in_items),
-                            tname => {
-                                cx.span_err(titem.span, fmt!("unknown \
-                                    `deriving` trait: `%s`", tname));
-                                in_items
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
 pub fn expand_deriving_eq(cx: ext_ctxt,
                           span: span,
                           _mitem: @meta_item,