Skip to content

Commit 14e2fe4

Browse files
committed
Auto merge of #106033 - ChrisDenton:bump-cfg-if, r=Mark-Simulacrum
Remove old version of `cfg-if` by bumping `packed_simd_2` and `getrandom v0.2` versions ```console > cargo update --package packed_simd_2 --package [email protected] Updating crates.io index Removing cfg-if v0.1.10 Updating getrandom v0.2.0 -> v0.2.8 Updating packed_simd_2 v0.3.4 -> v0.3.8 ``` `packed_simd_2` is only used as a dependency of `bytecount` which in turn is only used by `rustfmt`. I can't see any issue with the minor version bump. The bigger jump is `[email protected]` which is used by a number of things, but 0.2.8 is still semver compatible and there doesn't seem to be any worrying changes (see the [changelog](https://github.com/rust-random/getrandom/blob/master/CHANGELOG.md)). The only breaking change are the removal of XP, stdweb and CloudAbi support but these are not host targets and rustc lacks support for them in any case (stdweb development was [abandonded](https://rustsec.org/advisories/RUSTSEC-2020-0056.html), XP is [tier 3 and `no_std`](https://doc.rust-lang.org/beta/rustc/platform-support.html#tier-3) and CloubAbi is [no longer supported](#78439)). Note that this doesn't affect `[email protected]` which is what std depends on and which is already using the latest version of `cfg-if` (besides, there are already plans to remove that entirely).
2 parents 5e656ba + 531f3c9 commit 14e2fe4

File tree

1 file changed

+44
-50
lines changed

1 file changed

+44
-50
lines changed

Cargo.lock

+44-50
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ version = "0.7.4"
3030
source = "registry+https://github.com/rust-lang/crates.io-index"
3131
checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
3232
dependencies = [
33-
"getrandom 0.2.0",
33+
"getrandom 0.2.8",
3434
"once_cell",
3535
"version_check",
3636
]
@@ -190,7 +190,7 @@ checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
190190
dependencies = [
191191
"addr2line",
192192
"cc",
193-
"cfg-if 1.0.0",
193+
"cfg-if",
194194
"libc",
195195
"miniz_oxide",
196196
"object",
@@ -511,12 +511,6 @@ dependencies = [
511511
"jobserver",
512512
]
513513

514-
[[package]]
515-
name = "cfg-if"
516-
version = "0.1.10"
517-
source = "registry+https://github.com/rust-lang/crates.io-index"
518-
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
519-
520514
[[package]]
521515
name = "cfg-if"
522516
version = "1.0.0"
@@ -960,7 +954,7 @@ version = "1.3.2"
960954
source = "registry+https://github.com/rust-lang/crates.io-index"
961955
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
962956
dependencies = [
963-
"cfg-if 1.0.0",
957+
"cfg-if",
964958
]
965959

966960
[[package]]
@@ -969,7 +963,7 @@ version = "0.5.6"
969963
source = "registry+https://github.com/rust-lang/crates.io-index"
970964
checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
971965
dependencies = [
972-
"cfg-if 1.0.0",
966+
"cfg-if",
973967
"crossbeam-utils",
974968
]
975969

@@ -979,7 +973,7 @@ version = "0.8.2"
979973
source = "registry+https://github.com/rust-lang/crates.io-index"
980974
checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
981975
dependencies = [
982-
"cfg-if 1.0.0",
976+
"cfg-if",
983977
"crossbeam-epoch",
984978
"crossbeam-utils",
985979
]
@@ -991,7 +985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
991985
checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
992986
dependencies = [
993987
"autocfg",
994-
"cfg-if 1.0.0",
988+
"cfg-if",
995989
"crossbeam-utils",
996990
"memoffset",
997991
"scopeguard",
@@ -1003,7 +997,7 @@ version = "0.8.14"
1003997
source = "registry+https://github.com/rust-lang/crates.io-index"
1004998
checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
1005999
dependencies = [
1006-
"cfg-if 1.0.0",
1000+
"cfg-if",
10071001
]
10081002

10091003
[[package]]
@@ -1163,7 +1157,7 @@ version = "2.0.0"
11631157
source = "registry+https://github.com/rust-lang/crates.io-index"
11641158
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
11651159
dependencies = [
1166-
"cfg-if 1.0.0",
1160+
"cfg-if",
11671161
"dirs-sys-next",
11681162
]
11691163

@@ -1366,7 +1360,7 @@ version = "0.2.14"
13661360
source = "registry+https://github.com/rust-lang/crates.io-index"
13671361
checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
13681362
dependencies = [
1369-
"cfg-if 1.0.0",
1363+
"cfg-if",
13701364
"libc",
13711365
"redox_syscall",
13721366
"winapi",
@@ -1384,7 +1378,7 @@ version = "1.0.23"
13841378
source = "registry+https://github.com/rust-lang/crates.io-index"
13851379
checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
13861380
dependencies = [
1387-
"cfg-if 1.0.0",
1381+
"cfg-if",
13881382
"crc32fast",
13891383
"libc",
13901384
"libz-sys",
@@ -1623,20 +1617,20 @@ version = "0.1.16"
16231617
source = "registry+https://github.com/rust-lang/crates.io-index"
16241618
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
16251619
dependencies = [
1626-
"cfg-if 1.0.0",
1620+
"cfg-if",
16271621
"libc",
16281622
"wasi 0.9.0+wasi-snapshot-preview1",
16291623
]
16301624

16311625
[[package]]
16321626
name = "getrandom"
1633-
version = "0.2.0"
1627+
version = "0.2.8"
16341628
source = "registry+https://github.com/rust-lang/crates.io-index"
1635-
checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
1629+
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
16361630
dependencies = [
1637-
"cfg-if 0.1.10",
1631+
"cfg-if",
16381632
"libc",
1639-
"wasi 0.9.0+wasi-snapshot-preview1",
1633+
"wasi 0.11.0+wasi-snapshot-preview1",
16401634
]
16411635

16421636
[[package]]
@@ -2006,7 +2000,7 @@ version = "0.1.12"
20062000
source = "registry+https://github.com/rust-lang/crates.io-index"
20072001
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
20082002
dependencies = [
2009-
"cfg-if 1.0.0",
2003+
"cfg-if",
20102004
]
20112005

20122006
[[package]]
@@ -2190,7 +2184,7 @@ version = "0.7.1"
21902184
source = "registry+https://github.com/rust-lang/crates.io-index"
21912185
checksum = "c0cf036d15402bea3c5d4de17b3fce76b3e4a56ebc1f577be0e7a72f7c607cf0"
21922186
dependencies = [
2193-
"cfg-if 1.0.0",
2187+
"cfg-if",
21942188
"winapi",
21952189
]
21962190

@@ -2291,7 +2285,7 @@ version = "0.4.14"
22912285
source = "registry+https://github.com/rust-lang/crates.io-index"
22922286
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
22932287
dependencies = [
2294-
"cfg-if 1.0.0",
2288+
"cfg-if",
22952289
]
22962290

22972291
[[package]]
@@ -2486,7 +2480,7 @@ version = "0.1.0"
24862480
dependencies = [
24872481
"colored",
24882482
"env_logger 0.9.0",
2489-
"getrandom 0.2.0",
2483+
"getrandom 0.2.8",
24902484
"lazy_static",
24912485
"libc",
24922486
"libffi",
@@ -2582,7 +2576,7 @@ version = "0.3.1"
25822576
source = "registry+https://github.com/rust-lang/crates.io-index"
25832577
checksum = "5a518809ac14b25b569624d0268eba1e88498f71615893dca57982bed7621abb"
25842578
dependencies = [
2585-
"cfg-if 1.0.0",
2579+
"cfg-if",
25862580
]
25872581

25882582
[[package]]
@@ -2608,7 +2602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
26082602
checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
26092603
dependencies = [
26102604
"bitflags",
2611-
"cfg-if 1.0.0",
2605+
"cfg-if",
26122606
"foreign-types",
26132607
"libc",
26142608
"once_cell",
@@ -2687,11 +2681,11 @@ checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b"
26872681

26882682
[[package]]
26892683
name = "packed_simd_2"
2690-
version = "0.3.4"
2684+
version = "0.3.8"
26912685
source = "registry+https://github.com/rust-lang/crates.io-index"
2692-
checksum = "3278e0492f961fd4ae70909f56b2723a7e8d01a228427294e19cdfdebda89a17"
2686+
checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
26932687
dependencies = [
2694-
"cfg-if 0.1.10",
2688+
"cfg-if",
26952689
"libm",
26962690
]
26972691

@@ -2700,7 +2694,7 @@ name = "panic_abort"
27002694
version = "0.0.0"
27012695
dependencies = [
27022696
"alloc",
2703-
"cfg-if 1.0.0",
2697+
"cfg-if",
27042698
"compiler_builtins",
27052699
"core",
27062700
"libc",
@@ -2711,7 +2705,7 @@ name = "panic_unwind"
27112705
version = "0.0.0"
27122706
dependencies = [
27132707
"alloc",
2714-
"cfg-if 1.0.0",
2708+
"cfg-if",
27152709
"compiler_builtins",
27162710
"core",
27172711
"libc",
@@ -2745,7 +2739,7 @@ version = "0.8.5"
27452739
source = "registry+https://github.com/rust-lang/crates.io-index"
27462740
checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
27472741
dependencies = [
2748-
"cfg-if 1.0.0",
2742+
"cfg-if",
27492743
"instant",
27502744
"libc",
27512745
"redox_syscall",
@@ -2759,7 +2753,7 @@ version = "0.9.4"
27592753
source = "registry+https://github.com/rust-lang/crates.io-index"
27602754
checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
27612755
dependencies = [
2762-
"cfg-if 1.0.0",
2756+
"cfg-if",
27632757
"libc",
27642758
"redox_syscall",
27652759
"smallvec",
@@ -3121,7 +3115,7 @@ version = "0.6.2"
31213115
source = "registry+https://github.com/rust-lang/crates.io-index"
31223116
checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
31233117
dependencies = [
3124-
"getrandom 0.2.0",
3118+
"getrandom 0.2.8",
31253119
]
31263120

31273121
[[package]]
@@ -3190,7 +3184,7 @@ version = "0.4.0"
31903184
source = "registry+https://github.com/rust-lang/crates.io-index"
31913185
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
31923186
dependencies = [
3193-
"getrandom 0.2.0",
3187+
"getrandom 0.2.8",
31943188
"redox_syscall",
31953189
]
31963190

@@ -3681,7 +3675,7 @@ version = "0.0.0"
36813675
dependencies = [
36823676
"arrayvec",
36833677
"bitflags",
3684-
"cfg-if 1.0.0",
3678+
"cfg-if",
36853679
"ena",
36863680
"indexmap",
36873681
"jobserver",
@@ -4466,7 +4460,7 @@ dependencies = [
44664460
name = "rustc_span"
44674461
version = "0.0.0"
44684462
dependencies = [
4469-
"cfg-if 1.0.0",
4463+
"cfg-if",
44704464
"md-5",
44714465
"rustc_arena",
44724466
"rustc_data_structures",
@@ -4875,7 +4869,7 @@ version = "0.10.0"
48754869
source = "registry+https://github.com/rust-lang/crates.io-index"
48764870
checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
48774871
dependencies = [
4878-
"cfg-if 1.0.0",
4872+
"cfg-if",
48794873
"cpufeatures",
48804874
"digest",
48814875
]
@@ -4886,7 +4880,7 @@ version = "0.10.1"
48864880
source = "registry+https://github.com/rust-lang/crates.io-index"
48874881
checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec"
48884882
dependencies = [
4889-
"cfg-if 1.0.0",
4883+
"cfg-if",
48904884
"cpufeatures",
48914885
"digest",
48924886
]
@@ -5028,7 +5022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
50285022
checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
50295023
dependencies = [
50305024
"cc",
5031-
"cfg-if 1.0.0",
5025+
"cfg-if",
50325026
"libc",
50335027
"psm",
50345028
"winapi",
@@ -5046,7 +5040,7 @@ version = "0.0.0"
50465040
dependencies = [
50475041
"addr2line",
50485042
"alloc",
5049-
"cfg-if 1.0.0",
5043+
"cfg-if",
50505044
"compiler_builtins",
50515045
"core",
50525046
"dlmalloc",
@@ -5070,7 +5064,7 @@ dependencies = [
50705064
name = "std_detect"
50715065
version = "0.1.5"
50725066
dependencies = [
5073-
"cfg-if 1.0.0",
5067+
"cfg-if",
50745068
"compiler_builtins",
50755069
"libc",
50765070
"rustc-std-workspace-alloc",
@@ -5177,7 +5171,7 @@ version = "3.3.0"
51775171
source = "registry+https://github.com/rust-lang/crates.io-index"
51785172
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
51795173
dependencies = [
5180-
"cfg-if 1.0.0",
5174+
"cfg-if",
51815175
"fastrand",
51825176
"libc",
51835177
"redox_syscall",
@@ -5230,7 +5224,7 @@ dependencies = [
52305224
name = "test"
52315225
version = "0.0.0"
52325226
dependencies = [
5233-
"cfg-if 1.0.0",
5227+
"cfg-if",
52345228
"core",
52355229
"getopts",
52365230
"libc",
@@ -5246,7 +5240,7 @@ version = "0.9.0"
52465240
source = "registry+https://github.com/rust-lang/crates.io-index"
52475241
checksum = "0639d10d8f4615f223a57275cf40f9bdb7cfbb806bcb7f7cc56e3beb55a576eb"
52485242
dependencies = [
5249-
"cfg-if 1.0.0",
5243+
"cfg-if",
52505244
"getopts",
52515245
"libc",
52525246
"num_cpus",
@@ -5413,7 +5407,7 @@ version = "0.1.35"
54135407
source = "registry+https://github.com/rust-lang/crates.io-index"
54145408
checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
54155409
dependencies = [
5416-
"cfg-if 1.0.0",
5410+
"cfg-if",
54175411
"pin-project-lite",
54185412
"tracing-attributes",
54195413
"tracing-core",
@@ -5499,7 +5493,7 @@ version = "1.6.3"
54995493
source = "registry+https://github.com/rust-lang/crates.io-index"
55005494
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
55015495
dependencies = [
5502-
"cfg-if 1.0.0",
5496+
"cfg-if",
55035497
"rand 0.8.5",
55045498
"static_assertions",
55055499
]
@@ -5746,7 +5740,7 @@ name = "unwind"
57465740
version = "0.0.0"
57475741
dependencies = [
57485742
"cc",
5749-
"cfg-if 1.0.0",
5743+
"cfg-if",
57505744
"compiler_builtins",
57515745
"core",
57525746
"libc",
@@ -5783,7 +5777,7 @@ version = "0.8.2"
57835777
source = "registry+https://github.com/rust-lang/crates.io-index"
57845778
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
57855779
dependencies = [
5786-
"getrandom 0.2.0",
5780+
"getrandom 0.2.8",
57875781
]
57885782

57895783
[[package]]

0 commit comments

Comments
 (0)