diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2023-02-06 03:45:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-06 03:45:35 +0000 |
commit | 64037efacf1cb1b0d44126a11cd7f7afcab91545 (patch) | |
tree | aa630e7856a5fedfe11ef8d5bb614b80be27be53 | |
parent | 683e7b9afd35fe6a168b4262c10bfd4dbcf27b7c (diff) | |
parent | baffc69dd410aab763f791c4a58e309e6a7cf3b3 (diff) | |
download | num_cpus-64037efacf1cb1b0d44126a11cd7f7afcab91545.tar.gz |
Upgrade num_cpus to 1.15.0 am: 15c35a5286 am: 6931657f61 am: baffc69dd4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num_cpus/+/2419305
Change-Id: I99ccb17e13ddbc22ea881d9a6683c5a957fcfe6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 12 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | Cargo.lock.saved | 26 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 10 |
8 files changed, 24 insertions, 44 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 663a551..d5c8f1d 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "90373f3865f92a0e8c5e137738fb91df19bea7e0" + "sha1": "5bea3c7986c2a5c6763ca1b3f6d6982aca7cdc23" }, "path_in_vcs": "" }
\ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9adc30..36dc5b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: - x86_64-unknown-linux-gnu steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run tests run: | rustup default ${{ matrix.rust }} @@ -55,7 +55,7 @@ jobs: - x86_64-unknown-linux-musl steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run tests run: | rustup default ${{ matrix.rust }} @@ -75,7 +75,7 @@ jobs: - x86_64-apple-darwin steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run tests run: | rustup default ${{ matrix.rust }} @@ -96,7 +96,7 @@ jobs: - x86_64-pc-windows-msvc steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run tests run: | rustup default ${{ matrix.rust }} @@ -143,7 +143,7 @@ jobs: - aarch64-apple-ios-sim - aarch64-apple-darwin steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run build run: | rustup default ${{ matrix.rust }} @@ -154,7 +154,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Test Cgroup run: | docker build -f ci/cgroups/Dockerfile -t num-cpus-cgroups . @@ -42,7 +42,7 @@ rust_library { host_supported: true, crate_name: "num_cpus", cargo_env_compat: true, - cargo_pkg_version: "1.14.0", + cargo_pkg_version: "1.15.0", srcs: ["src/lib.rs"], edition: "2015", rustlibs: [ @@ -64,7 +64,7 @@ rust_test { name: "num_cpus_test_src_lib", crate_name: "num_cpus", cargo_env_compat: true, - cargo_pkg_version: "1.14.0", + cargo_pkg_version: "1.15.0", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, diff --git a/CHANGELOG.md b/CHANGELOG.md index 6680c79..5be725c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v1.15.0 + +### Fixes + +- update hermit-abi + ## v1.14.0 ### Features diff --git a/Cargo.lock.saved b/Cargo.lock.saved deleted file mode 100644 index 30bfe74..0000000 --- a/Cargo.lock.saved +++ /dev/null @@ -1,26 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "hermit-abi" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" -dependencies = [ - "libc", -] - -[[package]] -name = "libc" -version = "0.2.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" - -[[package]] -name = "num_cpus" -version = "1.14.0" -dependencies = [ - "hermit-abi", - "libc", -] @@ -11,7 +11,7 @@ [package] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" authors = ["Sean McArthur <sean@seanmonstar.com>"] description = "Get the number of CPUs on a machine." documentation = "https://docs.rs/num_cpus" @@ -26,7 +26,7 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/seanmonstar/num_cpus" [target."cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))".dependencies.hermit-abi] -version = "0.1.3" +version = "0.2.6" [target."cfg(not(windows))".dependencies.libc] version = "0.2.26" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index d3e02d4..5ebfd93 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,7 +1,7 @@ [package] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" description = "Get the number of CPUs on a machine." authors = ["Sean McArthur <sean@seanmonstar.com>"] license = "MIT OR Apache-2.0" @@ -15,4 +15,4 @@ readme = "README.md" libc = "0.2.26" [target.'cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_os = "hermit"))'.dependencies] -hermit-abi = "0.1.3" +hermit-abi = "0.2.6" @@ -11,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/num_cpus/num_cpus-1.14.0.crate" + value: "https://static.crates.io/crates/num_cpus/num_cpus-1.15.0.crate" } - version: "1.14.0" + version: "1.15.0" license_type: NOTICE last_upgrade_date { - year: 2022 - month: 12 - day: 13 + year: 2023 + month: 2 + day: 3 } } |