---

yaml
---
r: 35479
b: refs/heads/master
c: a7159be
h: refs/heads/master
i:
  35477: 48c9b02
  35475: 523a5de
  35471: 1457fd6
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6439f2d54645915ce57f4c229811719e8e498151
+refs/heads/master: a7159be24a9c81517a46e09c7ff62cadc72759b6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/middle/trans/base.rs

@@ -52,7 +52,6 @@ use util::ppaux;
 use util::ppaux::{ty_to_str, ty_to_short_str};
 use syntax::diagnostic::expect;
 use util::common::indenter;
-use ty::DerivedMethodInfo;
 
 use build::*;
 use shape::*;
@@ -1878,10 +1877,6 @@ fn trans_item(ccx: @crate_ctxt, item: ast::item) {
         }
       }
       ast::item_impl(tps, _, _, ms) => {
-        // This call will do nothing if there are no derivable methods.
-        deriving::trans_deriving_impl(ccx, *path, item.ident, tps,
-                                      item.id);
-
         meth::trans_impl(ccx, *path, item.ident, ms, tps, None,
                          item.id);
       }
@@ -2112,20 +2107,7 @@ fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
     match ccx.item_vals.find(id) {
       Some(v) => v,
       None => {
-        // First, check whether we need to automatically generate a method
-        // via the deriving mechanism.
-        match ccx.tcx.automatically_derived_methods.find(local_def(id)) {
-            None => {}  // Continue.
-            Some(ref derived_method_info) => {
-                // XXX: Mark as internal if necessary.
-                let llfn = register_deriving_method(
-                    ccx, id, derived_method_info);
-                ccx.item_vals.insert(id, llfn);
-                return llfn;
-            }
-        }
 
-        // Failing that, look for an item.
         let mut exprt = false;
         let val = match ccx.tcx.items.get(id) {
           ast_map::node_item(i, pth) => {
@@ -2273,34 +2255,6 @@ fn register_method(ccx: @crate_ctxt, id: ast::node_id, pth: @ast_map::path,
     llfn
 }
 
-fn register_deriving_method(ccx: @crate_ctxt,
-                            id: ast::node_id,
-                            derived_method_info: &DerivedMethodInfo) ->
-                            ValueRef {
-    // Find the path of the item.
-    let path, span;
-    match ccx.tcx.items.get(derived_method_info.containing_impl.node) {
-        ast_map::node_item(item, found_path) => {
-            path = found_path;
-            span = item.span;
-        }
-        _ => {
-            ccx.tcx.sess.bug(~"derived method info containing impl didn't \
-                               refer to an item");
-        }
-    }
-
-    let path = vec::append(*path, ~[
-        ast_map::path_mod(
-            ccx.sess.parse_sess.interner.intern(@fmt!("__derived%d__", id))),
-        ast_map::path_name(derived_method_info.method_info.ident)
-    ]);
-    let mty = ty::lookup_item_type(ccx.tcx, local_def(id)).ty;
-    let llfn = register_fn_full(ccx, span, path, id, mty);
-    // XXX: Inline hint.
-    llfn
-}
-
 // The constant translation pass.
 fn trans_constant(ccx: @crate_ctxt, it: @ast::item) {
     let _icx = ccx.insn_ctxt("trans_constant");

trunk/src/librustc/middle/trans/callee.rs

@@ -223,8 +223,6 @@ fn trans_fn_ref_with_vtables(
     let must_monomorphise;
     if type_params.len() > 0 || opt_impl_did.is_some() {
         must_monomorphise = true;
-    } else if ccx.tcx.automatically_derived_methods.contains_key(def_id) {
-        must_monomorphise = false;
     } else if def_id.crate == ast::local_crate {
         let map_node = session::expect(
             ccx.sess,