From 15af06795c108622eef36c4838a1d52430a6198f Mon Sep 17 00:00:00 2001 From: Tomoaki Kawada Date: Mon, 1 Nov 2021 10:45:49 +0900 Subject: [PATCH 1/2] Bump libc dependency of std to 0.2.106 --- Cargo.lock | 4 ++-- library/std/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf19f5e0ae32f..7d2f1ef35d43c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1900,9 +1900,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.103" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" +checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673" dependencies = [ "rustc-std-workspace-core", ] diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 6bc445c6f2b07..248ecdf4befce 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -15,7 +15,7 @@ cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] } panic_unwind = { path = "../panic_unwind", optional = true } panic_abort = { path = "../panic_abort" } core = { path = "../core" } -libc = { version = "0.2.103", default-features = false, features = ['rustc-dep-of-std'] } +libc = { version = "0.2.106", default-features = false, features = ['rustc-dep-of-std'] } compiler_builtins = { version = "0.1.44" } profiler_builtins = { path = "../profiler_builtins", optional = true } unwind = { path = "../unwind" } From 26a6cc45152e591172fda717d3d03543f0b490ac Mon Sep 17 00:00:00 2001 From: Tomoaki Kawada Date: Fri, 29 Oct 2021 15:00:34 +0900 Subject: [PATCH 2/2] itron: Rename `itron::thread::{available_conccurrency -> available_parallelism}` Catching up with commit b4615b5bf9e3e722b480190714ad44ecd7fa2ed1 --- library/std/src/sys/itron/thread.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/std/src/sys/itron/thread.rs b/library/std/src/sys/itron/thread.rs index 4feb9c5a6d740..bb9fa54d02ea4 100644 --- a/library/std/src/sys/itron/thread.rs +++ b/library/std/src/sys/itron/thread.rs @@ -347,6 +347,6 @@ unsafe fn terminate_and_delete_current_task() -> ! { unsafe { crate::hint::unreachable_unchecked() }; } -pub fn available_concurrency() -> io::Result { +pub fn available_parallelism() -> io::Result { super::unsupported() }