---

yaml
---
r: 64906
b: refs/heads/snap-stage3
c: a591273
h: refs/heads/master
v: v3

Author: stepancheg

[refs]

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

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

@@ -16,6 +16,10 @@ Functions for the unit type.
 
 #[cfg(not(test))]
 use prelude::*;
+#[cfg(not(test))]
+use num::Zero;
+
+
 
 #[cfg(not(test))]
 impl Eq for () {
@@ -48,3 +52,10 @@ 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/rt/rust_builtin.cpp

@@ -932,12 +932,12 @@ static lock_and_signal change_dir_lock;
 
 extern "C" CDECL void
 rust_take_change_dir_lock() {
-    change_dir_lock.lock();
+    global_args_lock.lock();
 }
 
 extern "C" CDECL void
 rust_drop_change_dir_lock() {
-    change_dir_lock.unlock();
+    global_args_lock.unlock();
 }
 
 //

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

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