Bug 1817900 - Update num_cpus to 1.15.0. r=emilio,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D170445

Cargo.toml

@@ -133,6 +133,9 @@ nom = { path = "build/rust/nom" }
 # Patch nix 0.24 to 0.25
 nix = { path = "build/rust/nix" }
 
+# Patch hermit-abi 0.1 to 0.2
+hermit-abi = { path = "build/rust/hermit-abi" }
+
 # Patch autocfg to hide rustc output. Workaround for https://github.com/cuviper/autocfg/issues/30
 autocfg = { path = "third_party/rust/autocfg" }
 

build/rust/hermit-abi/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "hermit-abi"
+version = "0.1.999"
+edition = "2018"
+license = "MPL-2.0"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+hermit-abi = "0.2"

build/rust/hermit-abi/lib.rs

@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+pub use hermit_abi::*;

supply-chain/audits.toml

@@ -1221,6 +1221,11 @@ who = "Mike Hommey <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.4.0 -> 0.4.1"
 
+[[audits.hermit-abi]]
+who = "Mike Hommey <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.1.19 -> 0.2.6"
+
 [[audits.hex]]
 who = "Simon Friedberger <[email protected]>"
 criteria = "safe-to-deploy"
@@ -1636,6 +1641,11 @@ who = "Mike Hommey <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "1.13.1 -> 1.14.0"
 
+[[audits.num_cpus]]
+who = "Mike Hommey <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "1.14.0 -> 1.15.0"
+
 [[audits.object]]
 who = "Mike Hommey <[email protected]>"
 criteria = "safe-to-deploy"

third_party/rust/hermit-abi/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"023c46a92caf2fc7a31fba3e7d4428a287e1fbdef822ed7e9a8f91284a30b387","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"322fadd63e558e5a10caf980cbedf83ac1546ba40fd992f54492e21ce54205af","rust-toolchain":"58bea07cb6d97f9cfcd5c8f98b1feca0fb81cce5b0bf29a8e70ed2641956e9a6","src/lib.rs":"c7dca30b651c91590ff46370bdaa10214062b9456395fb4bd549dedbf457c695","src/tcplistener.rs":"c6e2db06d4265fa0956851e1c965336d60c53ab21573729aae76ecfe0ccc84c3","src/tcpstream.rs":"38a17de54213faf9de217f6146ff86ee75b67d4404a532b1419903269200936b"},"package":"62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"}
+{"files":{"Cargo.toml":"1b4c80e131e223ca0213e4efe1eda533cd665213aa94ec8920e9b65139cd2122","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"322fadd63e558e5a10caf980cbedf83ac1546ba40fd992f54492e21ce54205af","src/errno.rs":"1c0680ead2ddf26b12d34bd7fa3e1dab386df761d6ac1901889ece26682dc465","src/lib.rs":"f444c2cf2b93506719841cc46605dcded34d0a4b50ff7d5da8d56044610ca463","src/tcplistener.rs":"c6e2db06d4265fa0956851e1c965336d60c53ab21573729aae76ecfe0ccc84c3","src/tcpstream.rs":"38a17de54213faf9de217f6146ff86ee75b67d4404a532b1419903269200936b"},"package":"ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"}

third_party/rust/hermit-abi/Cargo.toml

@@ -3,28 +3,41 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
 
 [package]
-edition = "2018"
+edition = "2021"
 name = "hermit-abi"
-version = "0.1.19"
+version = "0.2.6"
 authors = ["Stefan Lankes"]
-description = "hermit-abi is small interface to call functions from the unikernel RustyHermit.\nIt is used to build the target `x86_64-unknown-hermit`.\n"
+description = """
+hermit-abi is small interface to call functions from the unikernel RustyHermit.
+It is used to build the target `x86_64-unknown-hermit`.
+"""
 documentation = "https://hermitcore.github.io/rusty-hermit/hermit_abi"
 readme = "README.md"
-keywords = ["unikernel", "libos"]
+keywords = [
+    "unikernel",
+    "libos",
+]
 categories = ["os"]
 license = "MIT/Apache-2.0"
-repository = "https://github.com/hermitcore/libhermit-rs"
+repository = "https://github.com/hermitcore/rusty-hermit"
+resolver = "1"
+
 [package.metadata.docs.rs]
-default-target = "x86_64-unknown-hermit"
 features = ["docs"]
+default-target = "x86_64-unknown-hermit"
+
+[dependencies.alloc]
+version = "1.0.0"
+optional = true
+package = "rustc-std-workspace-alloc"
+
 [dependencies.compiler_builtins]
 version = "0.1"
 optional = true
@@ -35,10 +48,15 @@ optional = true
 package = "rustc-std-workspace-core"
 
 [dependencies.libc]
-version = "0.2.51"
+version = "0.2"
 default-features = false
 
 [features]
 default = []
 docs = []
-rustc-dep-of-std = ["core", "compiler_builtins/rustc-dep-of-std", "libc/rustc-dep-of-std"]
+rustc-dep-of-std = [
+    "core",
+    "alloc",
+    "compiler_builtins/rustc-dep-of-std",
+    "libc/rustc-dep-of-std",
+]