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

rustup Adjusts our tests for rust-lang/rust#92697
rust-lang · Mar 5, 2022 · fcc2dd0 · fcc2dd0
2 parents a715171 + 72e6d41
commit fcc2dd0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-45660949132222ba7ec0905649b2affd68e0e13c
+c8a49fc90281d9a3227a547b5bac8e01d17325be
diff --git a/tests/run-pass/available-concurrency.rs → tests/run-pass/available-parallelism.rs b/tests/run-pass/available-concurrency.rs → 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 +1 @@
		45660949132222ba7ec0905649b2affd68e0e13c
		c8a49fc90281d9a3227a547b5bac8e01d17325be