---

yaml
---
r: 63429
b: refs/heads/snap-stage3
c: 6fbd538
h: refs/heads/master
i:
  63427: 095740f
v: v3

Author: bors

[refs]

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

branches/snap-stage3/src/libstd/rt/uv/timer.rs

@@ -143,7 +143,7 @@ mod test {
             let count_ptr: *mut int = &mut count;
             let mut loop_ = Loop::new();
             let mut timer = TimerWatcher::new(&mut loop_);
-            do timer.start(10, 20) |timer, status| {
+            do timer.start(1, 2) |timer, status| {
                 assert!(status.is_none());
                 unsafe {
                     *count_ptr += 1;
@@ -166,7 +166,7 @@ mod test {
 
                             // Restart the original timer
                             let mut timer = timer;
-                            do timer.start(10, 0) |timer, _| {
+                            do timer.start(1, 0) |timer, _| {
                                 unsafe { *count_ptr += 1; }
                                 timer.close(||());
                             }

branches/snap-stage3/src/rt/jemalloc/Makefile.in

@@ -9,7 +9,6 @@ vpath % .
 SHELL := /bin/sh
 
 CC := @CC@
-AR := @AR@
 
 # Configuration parameters.
 DESTDIR =

branches/snap-stage3/src/rt/jemalloc/configure

@@ -4453,7 +4453,7 @@ PIC_CFLAGS='-fPIC -DPIC'
 CTARGET='-o $@'
 LDTARGET='-o $@'
 EXTRA_LDFLAGS=
-MKLIB='$(AR) crus $@'
+MKLIB='ar crus $@'
 CC_MM=1
 
 default_munmap="1"