Auto merge of #1897 - camelid:rustup, r=RalfJung

bors · bors · commit fa91a89193d2 · 2021-10-07T19:48:53.000Z
rustup cc rust-lang/rust#89612 r? `@RalfJung`
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-25ec8273855fde2d72ae877b397e054de5300e10
+0157cc977fd71297ce73e2f249321f5ba2555d42
diff --git a/tests/run-pass/available-concurrency.rs b/tests/run-pass/available-concurrency.rs
@@ -1,5 +1,5 @@
-#![feature(available_concurrency)]
+#![feature(available_parallelism)]
 
 fn main() {
-    assert_eq!(std::thread::available_concurrency().unwrap().get(), 1);
+    assert_eq!(std::thread::available_parallelism().unwrap().get(), 1);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-#![feature(available_concurrency)]`
	`1`	`+#![feature(available_parallelism)]`
`2`	`2`
`3`	`3`	`fn main() {`
`4`		`- assert_eq!(std::thread::available_concurrency().unwrap().get(), 1);`
	`4`	`+ assert_eq!(std::thread::available_parallelism().unwrap().get(), 1);`
`5`	`5`	`}`