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

rustup cc rust-lang/rust#89612 r? `@RalfJung`
2021-10-07 19:48:53 +00:00 · 2021-10-07 19:48:53 +00:00 · fa91a89193
commit fa91a89193
parent f3af24096e e751c7b04e
2 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-25ec8273855fde2d72ae877b397e054de5300e10
+0157cc977fd71297ce73e2f249321f5ba2555d42
--- 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);
 }