Skip to content

Commit

Permalink
Rollup merge of #103367 - chbaker0:update-std-getrandom, r=thomcc
Browse files Browse the repository at this point in the history
Remove std's transitive dependency on cfg-if 0.1

After rust-lang/rust#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 rust-lang/rust#103365
  • Loading branch information
matthiaskrgr authored Nov 4, 2022
2 parents cd2e480 + 0f23b92 commit b2af3d1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion panic_abort/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion panic_unwind/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion unwind/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b2af3d1

Please sign in to comment.