Skip to content

Commit e94e4a6

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#61767 - JohnTitor:update-smallvec, r=nikomatsakis
Updates smallvec and new_debug_unreachable The version `0.6.10` of smallvec has released that fixes an [ICE](rust-lang#61549). This is re-submission of rust-lang#58773. And this may let rust-lang#56440 re-start.
2 parents 9c3a1f1 + 0e9fff5 commit e94e4a6

File tree

1 file changed

+28
-49
lines changed

1 file changed

+28
-49
lines changed

‎Cargo.lock‎

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ name = "arena"
7070
version = "0.0.0"
7171
dependencies = [
7272
"rustc_data_structures 0.0.0",
73-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
73+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
7474
]
7575

7676
[[package]]
@@ -438,7 +438,7 @@ dependencies = [
438438
"regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
439439
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
440440
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
441-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
441+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
442442
"toml 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
443443
"unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
444444
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -594,7 +594,7 @@ version = "0.3.8"
594594
source = "registry+https://github.com/rust-lang/crates.io-index"
595595
dependencies = [
596596
"crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
597-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
597+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
598598
]
599599

600600
[[package]]
@@ -999,7 +999,7 @@ version = "0.1.4"
999999
source = "registry+https://github.com/rust-lang/crates.io-index"
10001000
dependencies = [
10011001
"mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
1002-
"new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1002+
"new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
10031003
]
10041004

10051005
[[package]]
@@ -1697,11 +1697,8 @@ dependencies = [
16971697

16981698
[[package]]
16991699
name = "new_debug_unreachable"
1700-
version = "1.0.1"
1700+
version = "1.0.3"
17011701
source = "registry+https://github.com/rust-lang/crates.io-index"
1702-
dependencies = [
1703-
"unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1704-
]
17051702

17061703
[[package]]
17071704
name = "nodrop"
@@ -1856,7 +1853,7 @@ dependencies = [
18561853
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
18571854
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
18581855
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
1859-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
1856+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
18601857
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
18611858
]
18621859

@@ -2446,7 +2443,7 @@ dependencies = [
24462443
"rustc_target 0.0.0",
24472444
"scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
24482445
"serialize 0.0.0",
2449-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2446+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
24502447
"syntax 0.0.0",
24512448
"syntax_pos 0.0.0",
24522449
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2492,7 +2489,7 @@ dependencies = [
24922489
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
24932490
"rustc-rayon 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
24942491
"rustc-rayon-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2495-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2492+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
24962493
"stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
24972494
]
24982495

@@ -2528,7 +2525,7 @@ name = "rustc-ap-serialize"
25282525
version = "407.0.0"
25292526
source = "registry+https://github.com/rust-lang/crates.io-index"
25302527
dependencies = [
2531-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2528+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
25322529
]
25332530

25342531
[[package]]
@@ -2544,7 +2541,7 @@ dependencies = [
25442541
"rustc-ap-serialize 407.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
25452542
"rustc-ap-syntax_pos 407.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
25462543
"scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
2547-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2544+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
25482545
]
25492546

25502547
[[package]]
@@ -2658,7 +2655,7 @@ dependencies = [
26582655
"scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
26592656
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
26602657
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
2661-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2658+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
26622659
"syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
26632660
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
26642661
]
@@ -2672,7 +2669,7 @@ dependencies = [
26722669
"rustc_data_structures 0.0.0",
26732670
"rustc_errors 0.0.0",
26742671
"rustc_target 0.0.0",
2675-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2672+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
26762673
"syntax 0.0.0",
26772674
"syntax_pos 0.0.0",
26782675
]
@@ -2683,7 +2680,7 @@ version = "0.0.0"
26832680
dependencies = [
26842681
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
26852682
"rustc_cratesio_shim 0.0.0",
2686-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2683+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
26872684
]
26882685

26892686
[[package]]
@@ -2792,7 +2789,7 @@ dependencies = [
27922789
"rustc-rayon-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
27932790
"rustc_cratesio_shim 0.0.0",
27942791
"serialize 0.0.0",
2795-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2792+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
27962793
"stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
27972794
]
27982795

@@ -2826,7 +2823,7 @@ dependencies = [
28262823
"rustc_typeck 0.0.0",
28272824
"scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
28282825
"serialize 0.0.0",
2829-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2826+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
28302827
"syntax 0.0.0",
28312828
"syntax_ext 0.0.0",
28322829
"syntax_pos 0.0.0",
@@ -2891,7 +2888,7 @@ dependencies = [
28912888
"rustc_typeck 0.0.0",
28922889
"scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
28932890
"serialize 0.0.0",
2894-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2891+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
28952892
"syntax 0.0.0",
28962893
"syntax_ext 0.0.0",
28972894
"syntax_pos 0.0.0",
@@ -2952,7 +2949,7 @@ dependencies = [
29522949
"rustc_errors 0.0.0",
29532950
"rustc_target 0.0.0",
29542951
"serialize 0.0.0",
2955-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2952+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
29562953
"stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
29572954
"syntax 0.0.0",
29582955
"syntax_ext 0.0.0",
@@ -2976,7 +2973,7 @@ dependencies = [
29762973
"rustc_errors 0.0.0",
29772974
"rustc_target 0.0.0",
29782975
"serialize 0.0.0",
2979-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
2976+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
29802977
"syntax 0.0.0",
29812978
"syntax_pos 0.0.0",
29822979
]
@@ -3041,7 +3038,7 @@ dependencies = [
30413038
"rustc_data_structures 0.0.0",
30423039
"rustc_errors 0.0.0",
30433040
"rustc_metadata 0.0.0",
3044-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
3041+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
30453042
"syntax 0.0.0",
30463043
"syntax_pos 0.0.0",
30473044
]
@@ -3095,7 +3092,7 @@ dependencies = [
30953092
"rustc 0.0.0",
30963093
"rustc_data_structures 0.0.0",
30973094
"rustc_target 0.0.0",
3098-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
3095+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
30993096
"syntax 0.0.0",
31003097
"syntax_pos 0.0.0",
31013098
]
@@ -3121,7 +3118,7 @@ dependencies = [
31213118
"rustc_data_structures 0.0.0",
31223119
"rustc_errors 0.0.0",
31233120
"rustc_target 0.0.0",
3124-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
3121+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
31253122
"syntax 0.0.0",
31263123
"syntax_pos 0.0.0",
31273124
]
@@ -3303,7 +3300,7 @@ name = "serialize"
33033300
version = "0.0.0"
33043301
dependencies = [
33053302
"indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
3306-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
3303+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
33073304
]
33083305

33093306
[[package]]
@@ -3356,11 +3353,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
33563353

33573354
[[package]]
33583355
name = "smallvec"
3359-
version = "0.6.7"
3356+
version = "0.6.10"
33603357
source = "registry+https://github.com/rust-lang/crates.io-index"
3361-
dependencies = [
3362-
"unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
3363-
]
33643358

33653359
[[package]]
33663360
name = "socket2"
@@ -3409,7 +3403,7 @@ version = "0.7.3"
34093403
source = "registry+https://github.com/rust-lang/crates.io-index"
34103404
dependencies = [
34113405
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
3412-
"new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
3406+
"new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
34133407
"phf_shared 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)",
34143408
"precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
34153409
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3515,7 +3509,7 @@ dependencies = [
35153509
"rustc_target 0.0.0",
35163510
"scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
35173511
"serialize 0.0.0",
3518-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
3512+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
35193513
"syntax_pos 0.0.0",
35203514
]
35213515

@@ -3528,7 +3522,7 @@ dependencies = [
35283522
"rustc_data_structures 0.0.0",
35293523
"rustc_errors 0.0.0",
35303524
"rustc_target 0.0.0",
3531-
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
3525+
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
35323526
"syntax 0.0.0",
35333527
"syntax_pos 0.0.0",
35343528
]
@@ -3963,14 +3957,6 @@ name = "unicode_categories"
39633957
version = "0.1.1"
39643958
source = "registry+https://github.com/rust-lang/crates.io-index"
39653959

3966-
[[package]]
3967-
name = "unreachable"
3968-
version = "1.0.0"
3969-
source = "registry+https://github.com/rust-lang/crates.io-index"
3970-
dependencies = [
3971-
"void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
3972-
]
3973-
39743960
[[package]]
39753961
name = "unstable-book-gen"
39763962
version = "0.1.0"
@@ -4049,11 +4035,6 @@ name = "version_check"
40494035
version = "0.1.5"
40504036
source = "registry+https://github.com/rust-lang/crates.io-index"
40514037

4052-
[[package]]
4053-
name = "void"
4054-
version = "1.0.2"
4055-
source = "registry+https://github.com/rust-lang/crates.io-index"
4056-
40574038
[[package]]
40584039
name = "vte"
40594040
version = "0.3.3"
@@ -4317,7 +4298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
43174298
"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
43184299
"checksum miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226"
43194300
"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
4320-
"checksum new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
4301+
"checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30"
43214302
"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
43224303
"checksum num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8af1847c907c2f04d7bfd572fb25bbb4385c637fe5be163cf2f8c5d778fe1e7d"
43234304
"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
@@ -4427,7 +4408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
44274408
"checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
44284409
"checksum sized-chunks 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2a2eb3fe454976eefb479f78f9b394d34d661b647c6326a3a6e66f68bb12c26"
44294410
"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
4430-
"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
4411+
"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
44314412
"checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
44324413
"checksum stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbc596e092fe5f598b12ef46cc03754085ac2f4d8c739ad61c4ae266cc3b3fa"
44334414
"checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423"
@@ -4481,7 +4462,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
44814462
"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
44824463
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
44834464
"checksum unicode_categories 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
4484-
"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
44854465
"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
44864466
"checksum url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea"
44874467
"checksum utf-8 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1262dfab4c30d5cb7c07026be00ee343a6cf5027fdc0104a9160f354e5db75c"
@@ -4491,7 +4471,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
44914471
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
44924472
"checksum vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6aba5e34f93dc7051dfad05b98a18e9156f27e7b431fe1d2398cb6061c0a1dba"
44934473
"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
4494-
"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
44954474
"checksum vte 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf"
44964475
"checksum wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9f3bf741a801531993db6478b95682117471f76916f5e690dd8d45395b09349"
44974476
"checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1"

0 commit comments

Comments
 (0)