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

bors · bors · commit e23e0b2d12af · 2021-01-27T09:44:48.000Z
rustup; more slack for timing tests
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-a8f707553276a15565860af3d415aae18428aa96
+78e22069d018e83915201c8a218a0a94227f6420
diff --git a/tests/run-pass/concurrency/sync.rs b/tests/run-pass/concurrency/sync.rs
@@ -92,7 +92,7 @@ fn check_conditional_variables_timed_wait_timeout() {
     let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(100)).unwrap();
     assert!(timeout.timed_out());
     let elapsed_time = now.elapsed().as_millis();
-    assert!(100 <= elapsed_time && elapsed_time <= 300);
+    assert!(100 <= elapsed_time && elapsed_time <= 500);
 }
 
 /// Test that signaling a conditional variable when waiting with a timeout works

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ fn check_conditional_variables_timed_wait_timeout() {`
`92`	`92`	`let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(100)).unwrap();`
`93`	`93`	`assert!(timeout.timed_out());`
`94`	`94`	`let elapsed_time = now.elapsed().as_millis();`
`95`		`- assert!(100 <= elapsed_time && elapsed_time <= 300);`
	`95`	`+ assert!(100 <= elapsed_time && elapsed_time <= 500);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/// Test that signaling a conditional variable when waiting with a timeout works`