Commit fe6592f4 authored by Mike Hommey's avatar Mike Hommey
Browse files

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

Differential Revision: https://phabricator.services.mozilla.com/D170445
parent 1b107a92

Cargo.lock

+13 −6
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ version = "0.2.14" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"

dependencies = [

 "hermit-abi",

 "hermit-abi 0.1.999",

 "libc",

 "winapi",

]
@@ -2544,9 +2544,16 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" 


[[package]]

name = "hermit-abi"

version = "0.1.19"

version = "0.1.999"

dependencies = [

 "hermit-abi 0.2.6",

]



[[package]]

name = "hermit-abi"

version = "0.2.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"

checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"

dependencies = [

 "libc",

]
@@ -3888,11 +3895,11 @@ dependencies = [ 


[[package]]

name = "num_cpus"

version = "1.14.0"

version = "1.15.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"

checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"

dependencies = [

 "hermit-abi",

 "hermit-abi 0.2.6",

 "libc",

]

Cargo.toml

+3 −0
Original line number Diff line number Diff line
@@ -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 → 100644
+11 −0
Original line number Diff line number Diff line 
[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 → 100644
+5 −0
Original line number Diff line number Diff line 
/* 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

+10 −0
Original line number Diff line number Diff line
@@ -1221,6 +1221,11 @@ who = "Mike Hommey <mh+mozilla@glandium.org>" 
criteria = "safe-to-deploy"

delta = "0.4.0 -> 0.4.1"



[[audits.hermit-abi]]

who = "Mike Hommey <mh+mozilla@glandium.org>"

criteria = "safe-to-deploy"

delta = "0.1.19 -> 0.2.6"



[[audits.hex]]

who = "Simon Friedberger <simon@mozilla.com>"

criteria = "safe-to-deploy"
@@ -1636,6 +1641,11 @@ who = "Mike Hommey <mh+mozilla@glandium.org>" 
criteria = "safe-to-deploy"

delta = "1.13.1 -> 1.14.0"



[[audits.num_cpus]]

who = "Mike Hommey <mh+mozilla@glandium.org>"

criteria = "safe-to-deploy"

delta = "1.14.0 -> 1.15.0"



[[audits.object]]

who = "Mike Hommey <mh+mozilla@glandium.org>"

criteria = "safe-to-deploy"