---

yaml
---
r: 64907
b: refs/heads/snap-stage3
c: 6a69d27
h: refs/heads/master
i:
  64905: 784d44b
  64903: 5a93358
v: v3

Author: omasanori

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a5912736be38ff10e41b475634119f83b937a072
+refs/heads/snap-stage3: 6a69d27a0f0c9510b982e7bec5f8a72fd1da3296
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/base.rs

@@ -2258,15 +2258,13 @@ pub fn register_fn_full(ccx: @mut CrateContext,
                         node_type: ty::t)
                      -> ValueRef {
     let llfty = type_of_fn_from_ty(ccx, node_type);
-    register_fn_fuller(ccx, sp, sym, node_id, node_type,
-                       lib::llvm::CCallConv, llfty)
+    register_fn_fuller(ccx, sp, sym, node_id, lib::llvm::CCallConv, llfty)
 }
 
 pub fn register_fn_fuller(ccx: @mut CrateContext,
                           sp: span,
                           sym: ~str,
                           node_id: ast::NodeId,
-                          _node_type: ty::t,
                           cc: lib::llvm::CallConv,
                           fn_ty: Type)
                           -> ValueRef {

branches/snap-stage3/src/librustc/middle/trans/foreign.rs

@@ -1154,17 +1154,10 @@ pub fn register_foreign_fn(ccx: @mut CrateContext,
                            -> ValueRef {
     let _icx = push_ctxt("foreign::register_foreign_fn");
 
-    let t = ty::node_id_to_type(ccx.tcx, node_id);
     let sym = Cell::new(sym);
 
     let tys = shim_types(ccx, node_id);
     do tys.fn_ty.decl_fn |fnty| {
-        register_fn_fuller(ccx,
-                           sp,
-                           sym.take(),
-                           node_id,
-                           t,
-                           lib::llvm::CCallConv,
-                           fnty)
+        register_fn_fuller(ccx, sp, sym.take(), node_id, lib::llvm::CCallConv, fnty)
     }
 }

branches/snap-stage3/src/libstd/nil.rs

@@ -16,10 +16,6 @@ Functions for the unit type.
 
 #[cfg(not(test))]
 use prelude::*;
-#[cfg(not(test))]
-use num::Zero;
-
-
 
 #[cfg(not(test))]
 impl Eq for () {
@@ -52,10 +48,3 @@ impl TotalEq for () {
     #[inline]
     fn equals(&self, _other: &()) -> bool { true }
 }
-
-#[cfg(not(test))]
-impl Zero for () {
-    fn zero() -> () { () }
-    fn is_zero(&self) -> bool { true }
-}
-

branches/snap-stage3/src/test/run-pass/deriving-zero.rs

@@ -34,7 +34,6 @@ struct Lots {
     h: ~[util::NonCopyable],
     i: @mut (int, int),
     j: bool,
-    k: (),
 }
 
 fn main() {