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

bors · bors · commit fcc2dd033d0b · 2022-03-05T15:55:06.000Z
rustup Adjusts our tests for rust-lang/rust#92697
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-45660949132222ba7ec0905649b2affd68e0e13c
+c8a49fc90281d9a3227a547b5bac8e01d17325be
diff --git a/tests/run-pass/available-parallelism.rs b/tests/run-pass/available-parallelism.rs
@@ -1,3 +1,5 @@
+// compile-flags: -Zmiri-disable-isolation
+
 fn main() {
     assert_eq!(std::thread::available_parallelism().unwrap().get(), 1);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// compile-flags: -Zmiri-disable-isolation`
	`2`	`+`
`1`	`3`	`fn main() {`
`2`	`4`	`assert_eq!(std::thread::available_parallelism().unwrap().get(), 1);`
`3`	`5`	`}`