diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-11-04 18:52:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 18:52:25 +0100 |
| commit | dabb6c6bd7e06bb27655f2393f722fdcee74da5e (patch) | |
| tree | f8043dfdc4a2535ab486926383026d18a257ec85 | |
| parent | 6330c27ae24ec1556cf2b97eeac333dc23391686 (diff) | |
| parent | dfab01b6e0ee60dda61b2c51ac76850c5e79b550 (diff) | |
| download | rust-dabb6c6bd7e06bb27655f2393f722fdcee74da5e.tar.gz rust-dabb6c6bd7e06bb27655f2393f722fdcee74da5e.zip | |
Rollup merge of #103367 - chbaker0:update-std-getrandom, r=thomcc
Remove std's transitive dependency on cfg-if 0.1 After https://github.com/rust-lang/rust/pull/101946 this completes the move to cfg-if 1.0 by: * Updating getrandom 0.1.14->0.1.16 * Updating panic_abort's and unwind's dep to cfg-if 1.0 Fixes https://github.com/rust-lang/rust/issues/103365
| -rw-r--r-- | Cargo.lock | 16 | ||||
| -rw-r--r-- | library/panic_abort/Cargo.toml | 2 | ||||
| -rw-r--r-- | library/panic_unwind/Cargo.toml | 2 | ||||
| -rw-r--r-- | library/unwind/Cargo.toml | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1a91898be4e..075c5d44046 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1526,11 +1526,11 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -2478,7 +2478,7 @@ name = "panic_abort" version = "0.0.0" dependencies = [ "alloc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "compiler_builtins", "core", "libc", @@ -2489,7 +2489,7 @@ name = "panic_unwind" version = "0.0.0" dependencies = [ "alloc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "compiler_builtins", "core", "libc", @@ -2817,7 +2817,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom 0.1.14", + "getrandom 0.1.16", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", @@ -2861,7 +2861,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.14", + "getrandom 0.1.16", ] [[package]] @@ -5357,7 +5357,7 @@ name = "unwind" version = "0.0.0" dependencies = [ "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "compiler_builtins", "core", "libc", diff --git a/library/panic_abort/Cargo.toml b/library/panic_abort/Cargo.toml index 46183d1ad00..e6ea2b1849b 100644 --- a/library/panic_abort/Cargo.toml +++ b/library/panic_abort/Cargo.toml @@ -13,7 +13,7 @@ doc = false [dependencies] alloc = { path = "../alloc" } -cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] } +cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] } core = { path = "../core" } libc = { version = "0.2", default-features = false } compiler_builtins = "0.1.0" diff --git a/library/panic_unwind/Cargo.toml b/library/panic_unwind/Cargo.toml index d720cc7bcbd..85386976d63 100644 --- a/library/panic_unwind/Cargo.toml +++ b/library/panic_unwind/Cargo.toml @@ -17,4 +17,4 @@ core = { path = "../core" } libc = { version = "0.2", default-features = false } unwind = { path = "../unwind" } compiler_builtins = "0.1.0" -cfg-if = "0.1.8" +cfg-if = "1.0" diff --git a/library/unwind/Cargo.toml b/library/unwind/Cargo.toml index 69fce8d7795..32c4a7eb5c1 100644 --- a/library/unwind/Cargo.toml +++ b/library/unwind/Cargo.toml @@ -17,7 +17,7 @@ doc = false core = { path = "../core" } libc = { version = "0.2.79", features = ['rustc-dep-of-std'], default-features = false } compiler_builtins = "0.1.0" -cfg-if = "0.1.8" +cfg-if = "1.0" [build-dependencies] cc = "1.0.69" |