Skip to content

Commit

Permalink
Rollup merge of rust-lang#104692 - chbaker0:libtest-cfg-if, r=thomcc
Browse files Browse the repository at this point in the history
Update test's cfg-if dependency to 1.0

This change was mistakenly left out of rust-lang#103367

Finishes rust-lang#103365
  • Loading branch information
matthiaskrgr committed Nov 21, 2022
2 parents 816a31f + 426296e commit 04e8ebe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,6 @@ name = "cfg-if"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-core",
]

[[package]]
name = "cfg-if"
Expand Down Expand Up @@ -4934,7 +4930,7 @@ dependencies = [
name = "test"
version = "0.0.0"
dependencies = [
"cfg-if 0.1.10",
"cfg-if 1.0.0",
"core",
"getopts",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion library/test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
crate-type = ["dylib", "rlib"]

[dependencies]
cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
getopts = { version = "0.2.21", features = ['rustc-dep-of-std'] }
std = { path = "../std" }
core = { path = "../core" }
Expand Down

0 comments on commit 04e8ebe

Please sign in to comment.