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

bors · bors · commit ce31a12f36e5 · 2020-10-22T08:08:41.000Z
rustup; increase slack for timing tests
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-c38ddb8040edce1b05bc09a0e8439472e9f67623
+8f0fa9d51ff4ad2c0869e660856cd327e79915e9
diff --git a/tests/run-pass/concurrency/sync.rs b/tests/run-pass/concurrency/sync.rs
@@ -319,7 +319,7 @@ fn park_timeout() {
     // Normally, waiting in park/park_timeout may spuriously wake up early, but we
     // know Miri's timed synchronization primitives do not do that.
 
-    assert!((200..500).contains(&start.elapsed().as_millis()));
+    assert!((200..1000).contains(&start.elapsed().as_millis()));
 }
 
 fn park_unpark() {
@@ -337,7 +337,7 @@ fn park_unpark() {
     // Normally, waiting in park/park_timeout may spuriously wake up early, but we
     // know Miri's timed synchronization primitives do not do that.
 
-    assert!((200..500).contains(&start.elapsed().as_millis()));
+    assert!((200..1000).contains(&start.elapsed().as_millis()));
 }
 
 fn main() {

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ fn park_timeout() {`
`319`	`319`	`// Normally, waiting in park/park_timeout may spuriously wake up early, but we`
`320`	`320`	`// know Miri's timed synchronization primitives do not do that.`
`321`	`321`
`322`		`- assert!((200..500).contains(&start.elapsed().as_millis()));`
	`322`	`+ assert!((200..1000).contains(&start.elapsed().as_millis()));`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`fn park_unpark() {`
`@@ -337,7 +337,7 @@ fn park_unpark() {`
`337`	`337`	`// Normally, waiting in park/park_timeout may spuriously wake up early, but we`
`338`	`338`	`// know Miri's timed synchronization primitives do not do that.`
`339`	`339`
`340`		`- assert!((200..500).contains(&start.elapsed().as_millis()));`
	`340`	`+ assert!((200..1000).contains(&start.elapsed().as_millis()));`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`fn main() {`