Skip to content

Commit a039b22

Browse files
authored
Rollup merge of #105949 - ChrisDenton:bump-cfg-if, r=Nilstrieb
Bump `cfg-if` to `1.0` in rustc crates When `packed_simd_2` and `getrandom` are updated to newer versions, we will no longer have a dependency on old `cfg_if` versions.
2 parents 2ddfa8f + b859b8b commit a039b22

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3590,7 +3590,7 @@ version = "0.0.0"
35903590
dependencies = [
35913591
"arrayvec",
35923592
"bitflags",
3593-
"cfg-if 0.1.10",
3593+
"cfg-if 1.0.0",
35943594
"ena",
35953595
"indexmap",
35963596
"jobserver",
@@ -4374,7 +4374,7 @@ dependencies = [
43744374
name = "rustc_span"
43754375
version = "0.0.0"
43764376
dependencies = [
4377-
"cfg-if 0.1.10",
4377+
"cfg-if 1.0.0",
43784378
"md-5",
43794379
"rustc_arena",
43804380
"rustc_data_structures",

compiler/rustc_data_structures/Cargo.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
arrayvec = { version = "0.7", default-features = false }
1010
bitflags = "1.2.1"
11-
cfg-if = "0.1.2"
11+
cfg-if = "1.0"
1212
ena = "0.14"
1313
indexmap = { version = "1.9.1" }
1414
jobserver_crate = { version = "0.1.13", package = "jobserver" }
@@ -21,7 +21,11 @@ rustc-hash = "1.1.0"
2121
rustc_index = { path = "../rustc_index", package = "rustc_index" }
2222
rustc_macros = { path = "../rustc_macros" }
2323
rustc_serialize = { path = "../rustc_serialize" }
24-
smallvec = { version = "1.8.1", features = ["const_generics", "union", "may_dangle"] }
24+
smallvec = { version = "1.8.1", features = [
25+
"const_generics",
26+
"union",
27+
"may_dangle",
28+
] }
2529
stable_deref_trait = "1.0.0"
2630
stacker = "0.1.15"
2731
tempfile = "3.2"

compiler/rustc_span/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rustc_index = { path = "../rustc_index" }
1313
rustc_arena = { path = "../rustc_arena" }
1414
scoped-tls = "1.0"
1515
unicode-width = "0.1.4"
16-
cfg-if = "0.1.2"
16+
cfg-if = "1.0"
1717
tracing = "0.1"
1818
sha1 = { package = "sha-1", version = "0.10.0" }
1919
sha2 = "0.10.1"

0 commit comments

Comments
 (0)