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

rustup

cc rust-lang/rust#89612

r? `@RalfJung`

diff --git a/rust-version b/rust-version
index 0423627269b2688dc97eb2c4b5102e5046dca85b..fdd83d70814242bcb90622db7738e634829349e2 100644 (file)
--- 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
index 5f3121ca8a63eaa73abc080e464abcc2f79d7780..422046c62d620cd87e7a38f90f9cae0e17626ad0 100644 (file)
--- 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);
 }