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

bors · bors · commit ede9ae6c513b · 2022-05-23T18:02:34.000Z
rustup On macOS the timing tests [failed again](https://github.com/rust-lang/miri/runs/6557930217?check_suite_focus=true), so let's give them even more slack.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-9e2f65586366b731f13a10021c5191a664f4adc2
+32c8c5df06c025441ad04791d7982d65c79a60e4
diff --git a/tests/run-pass/concurrency/sync.rs b/tests/run-pass/concurrency/sync.rs
@@ -91,7 +91,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 <= 800);
+    assert!(100 <= elapsed_time && elapsed_time <= 1000);
 }
 
 /// Test that signaling a conditional variable when waiting with a timeout works

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