Auto merge of #1624 - RalfJung:rustup, r=RalfJung

rustup; less strict timing tests

Author: bors

rust-version

@@ -1 +1 @@
-38030ffb4e735b26260848b744c0910a5641e1db
+12f0dba618e761c987142474435dff95ab177f3c

tests/run-pass/concurrency/linux-futex.rs

@@ -90,7 +90,7 @@ fn wait_timeout() {
         assert_eq!(*libc::__errno_location(), libc::ETIMEDOUT);
     }
 
-    assert!((200..500).contains(&start.elapsed().as_millis()));
+    assert!((200..1000).contains(&start.elapsed().as_millis()));
 }
 
 fn wait_wake() {
@@ -120,7 +120,7 @@ fn wait_wake() {
         ), 0);
     }
 
-    assert!((200..500).contains(&start.elapsed().as_millis()));
+    assert!((200..1000).contains(&start.elapsed().as_millis()));
 }
 
 fn main() {