Skip to content

Commit 7f4afdf

Browse files
committed
Auto merge of #84420 - workingjubilee:microvec, r=Mark-Simulacrum
Use arrayvec 0.7, drop smallvec 0.6 With the arrival of min const generics, many alt-vec libraries have updated to use it in some way and arrayvec is no exception. Use the latest with minor refactoring. Also, rustc_workspace_hack is the only user of smallvec 0.6 in the entire tree, so drop it.
2 parents 5f1aeb5 + e8eb691 commit 7f4afdf

File tree

8 files changed

+61
-69
lines changed

8 files changed

+61
-69
lines changed

Cargo.lock

+48-52
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,15 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
111111

112112
[[package]]
113113
name = "arrayvec"
114-
version = "0.5.1"
114+
version = "0.5.2"
115+
source = "registry+https://github.com/rust-lang/crates.io-index"
116+
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
117+
118+
[[package]]
119+
name = "arrayvec"
120+
version = "0.7.0"
115121
source = "registry+https://github.com/rust-lang/crates.io-index"
116-
checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
122+
checksum = "5a2f58b0bb10c380af2b26e57212856b8c9a59e0925b4c20f4a174a49734eaf7"
117123

118124
[[package]]
119125
name = "atty"
@@ -160,7 +166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
160166
checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
161167
dependencies = [
162168
"arrayref",
163-
"arrayvec",
169+
"arrayvec 0.5.2",
164170
"constant_time_eq",
165171
]
166172

@@ -2165,7 +2171,7 @@ dependencies = [
21652171
"parking_lot",
21662172
"perf-event-open-sys",
21672173
"rustc-hash",
2168-
"smallvec 1.6.1",
2174+
"smallvec",
21692175
]
21702176

21712177
[[package]]
@@ -2324,7 +2330,7 @@ dependencies = [
23242330
"rustc-workspace-hack",
23252331
"rustc_version",
23262332
"shell-escape",
2327-
"smallvec 1.6.1",
2333+
"smallvec",
23282334
]
23292335

23302336
[[package]]
@@ -2548,7 +2554,7 @@ dependencies = [
25482554
"instant",
25492555
"libc",
25502556
"redox_syscall 0.2.5",
2551-
"smallvec 1.6.1",
2557+
"smallvec",
25522558
"winapi 0.3.9",
25532559
]
25542560

@@ -3269,7 +3275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
32693275
checksum = "259cca0e975ecb05fd289ace45280c30ff792efc04e856a7f18b7fc86a3cb610"
32703276
dependencies = [
32713277
"rustc-ap-rustc_data_structures",
3272-
"smallvec 1.6.1",
3278+
"smallvec",
32733279
]
32743280

32753281
[[package]]
@@ -3285,7 +3291,7 @@ dependencies = [
32853291
"rustc-ap-rustc_macros",
32863292
"rustc-ap-rustc_serialize",
32873293
"rustc-ap-rustc_span",
3288-
"smallvec 1.6.1",
3294+
"smallvec",
32893295
"tracing",
32903296
]
32913297

@@ -3343,7 +3349,7 @@ version = "712.0.0"
33433349
source = "registry+https://github.com/rust-lang/crates.io-index"
33443350
checksum = "9cbfa7f82517a1b2efe7106c864c3f930b1da8aff07a27fd317af2f36522fd2e"
33453351
dependencies = [
3346-
"arrayvec",
3352+
"arrayvec 0.5.2",
33473353
"bitflags",
33483354
"cfg-if 0.1.10",
33493355
"crossbeam-utils 0.7.2",
@@ -3360,7 +3366,7 @@ dependencies = [
33603366
"rustc-hash",
33613367
"rustc-rayon",
33623368
"rustc-rayon-core",
3363-
"smallvec 1.6.1",
3369+
"smallvec",
33643370
"stable_deref_trait",
33653371
"stacker",
33663372
"tempfile",
@@ -3408,7 +3414,7 @@ dependencies = [
34083414
"rustc-ap-rustc_serialize",
34093415
"rustc-ap-rustc_session",
34103416
"rustc-ap-rustc_span",
3411-
"smallvec 1.6.1",
3417+
"smallvec",
34123418
"tracing",
34133419
]
34143420

@@ -3440,7 +3446,7 @@ version = "712.0.0"
34403446
source = "registry+https://github.com/rust-lang/crates.io-index"
34413447
checksum = "7f6f53afc4f7111c82295cb7ea3878f520bbac6a2c5a12e125b4ca9156498cff"
34423448
dependencies = [
3443-
"arrayvec",
3449+
"arrayvec 0.5.2",
34443450
"rustc-ap-rustc_macros",
34453451
"rustc-ap-rustc_serialize",
34463452
]
@@ -3496,7 +3502,7 @@ dependencies = [
34963502
"rustc-ap-rustc_lexer",
34973503
"rustc-ap-rustc_session",
34983504
"rustc-ap-rustc_span",
3499-
"smallvec 1.6.1",
3505+
"smallvec",
35003506
"tracing",
35013507
"unicode-normalization",
35023508
]
@@ -3508,7 +3514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
35083514
checksum = "d33c710120953c0214f47a6caf42064d7e241003b4af36c98a6d6156e70335f1"
35093515
dependencies = [
35103516
"indexmap",
3511-
"smallvec 1.6.1",
3517+
"smallvec",
35123518
]
35133519

35143520
[[package]]
@@ -3657,8 +3663,7 @@ dependencies = [
36573663
"quote",
36583664
"serde",
36593665
"serde_json",
3660-
"smallvec 0.6.14",
3661-
"smallvec 1.6.1",
3666+
"smallvec",
36623667
"syn",
36633668
"url 2.1.1",
36643669
"winapi 0.3.9",
@@ -3669,15 +3674,15 @@ name = "rustc_apfloat"
36693674
version = "0.0.0"
36703675
dependencies = [
36713676
"bitflags",
3672-
"smallvec 1.6.1",
3677+
"smallvec",
36733678
]
36743679

36753680
[[package]]
36763681
name = "rustc_arena"
36773682
version = "0.0.0"
36783683
dependencies = [
36793684
"rustc_data_structures",
3680-
"smallvec 1.6.1",
3685+
"smallvec",
36813686
]
36823687

36833688
[[package]]
@@ -3691,7 +3696,7 @@ dependencies = [
36913696
"rustc_macros",
36923697
"rustc_serialize",
36933698
"rustc_span",
3694-
"smallvec 1.6.1",
3699+
"smallvec",
36953700
"tracing",
36963701
]
36973702

@@ -3709,7 +3714,7 @@ dependencies = [
37093714
"rustc_session",
37103715
"rustc_span",
37113716
"rustc_target",
3712-
"smallvec 1.6.1",
3717+
"smallvec",
37133718
"tracing",
37143719
]
37153720

@@ -3772,7 +3777,7 @@ dependencies = [
37723777
"rustc_session",
37733778
"rustc_span",
37743779
"rustc_target",
3775-
"smallvec 1.6.1",
3780+
"smallvec",
37763781
"tracing",
37773782
]
37783783

@@ -3801,7 +3806,7 @@ dependencies = [
38013806
"rustc_session",
38023807
"rustc_span",
38033808
"rustc_target",
3804-
"smallvec 1.6.1",
3809+
"smallvec",
38053810
"snap",
38063811
"tracing",
38073812
]
@@ -3840,7 +3845,7 @@ dependencies = [
38403845
name = "rustc_data_structures"
38413846
version = "0.0.0"
38423847
dependencies = [
3843-
"arrayvec",
3848+
"arrayvec 0.7.0",
38443849
"bitflags",
38453850
"cfg-if 0.1.10",
38463851
"crossbeam-utils 0.7.2",
@@ -3858,7 +3863,7 @@ dependencies = [
38583863
"rustc_index",
38593864
"rustc_macros",
38603865
"rustc_serialize",
3861-
"smallvec 1.6.1",
3866+
"smallvec",
38623867
"stable_deref_trait",
38633868
"stacker",
38643869
"tempfile",
@@ -3941,7 +3946,7 @@ dependencies = [
39413946
"rustc_serialize",
39423947
"rustc_session",
39433948
"rustc_span",
3944-
"smallvec 1.6.1",
3949+
"smallvec",
39453950
"tracing",
39463951
]
39473952

@@ -3973,7 +3978,7 @@ dependencies = [
39733978
"rustc_serialize",
39743979
"rustc_span",
39753980
"rustc_target",
3976-
"smallvec 1.6.1",
3981+
"smallvec",
39773982
"tracing",
39783983
]
39793984

@@ -4010,7 +4015,7 @@ dependencies = [
40104015
name = "rustc_index"
40114016
version = "0.0.0"
40124017
dependencies = [
4013-
"arrayvec",
4018+
"arrayvec 0.7.0",
40144019
"rustc_macros",
40154020
"rustc_serialize",
40164021
]
@@ -4031,7 +4036,7 @@ dependencies = [
40314036
"rustc_session",
40324037
"rustc_span",
40334038
"rustc_target",
4034-
"smallvec 1.6.1",
4039+
"smallvec",
40354040
"tracing",
40364041
]
40374042

@@ -4075,7 +4080,7 @@ dependencies = [
40754080
"rustc_traits",
40764081
"rustc_ty_utils",
40774082
"rustc_typeck",
4078-
"smallvec 1.6.1",
4083+
"smallvec",
40794084
"tempfile",
40804085
"tracing",
40814086
"winapi 0.3.9",
@@ -4164,7 +4169,7 @@ dependencies = [
41644169
"rustc_session",
41654170
"rustc_span",
41664171
"rustc_target",
4167-
"smallvec 1.6.1",
4172+
"smallvec",
41684173
"snap",
41694174
"stable_deref_trait",
41704175
"tracing",
@@ -4196,7 +4201,7 @@ dependencies = [
41964201
"rustc_span",
41974202
"rustc_target",
41984203
"rustc_type_ir",
4199-
"smallvec 1.6.1",
4204+
"smallvec",
42004205
"tracing",
42014206
]
42024207

@@ -4227,7 +4232,7 @@ dependencies = [
42274232
"rustc_span",
42284233
"rustc_target",
42294234
"rustc_trait_selection",
4230-
"smallvec 1.6.1",
4235+
"smallvec",
42314236
"tracing",
42324237
]
42334238

@@ -4250,7 +4255,7 @@ dependencies = [
42504255
"rustc_span",
42514256
"rustc_target",
42524257
"rustc_trait_selection",
4253-
"smallvec 1.6.1",
4258+
"smallvec",
42544259
"tracing",
42554260
]
42564261

@@ -4267,7 +4272,7 @@ dependencies = [
42674272
"rustc_lexer",
42684273
"rustc_session",
42694274
"rustc_span",
4270-
"smallvec 1.6.1",
4275+
"smallvec",
42714276
"tracing",
42724277
"unicode-normalization",
42734278
]
@@ -4368,7 +4373,7 @@ dependencies = [
43684373
"rustc_serialize",
43694374
"rustc_session",
43704375
"rustc_span",
4371-
"smallvec 1.6.1",
4376+
"smallvec",
43724377
"tracing",
43734378
]
43744379

@@ -4392,7 +4397,7 @@ dependencies = [
43924397
"rustc_middle",
43934398
"rustc_session",
43944399
"rustc_span",
4395-
"smallvec 1.6.1",
4400+
"smallvec",
43964401
"tracing",
43974402
]
43984403

@@ -4421,7 +4426,7 @@ version = "0.0.0"
44214426
dependencies = [
44224427
"indexmap",
44234428
"rustc_macros",
4424-
"smallvec 1.6.1",
4429+
"smallvec",
44254430
]
44264431

44274432
[[package]]
@@ -4518,7 +4523,7 @@ dependencies = [
45184523
"rustc_session",
45194524
"rustc_span",
45204525
"rustc_target",
4521-
"smallvec 1.6.1",
4526+
"smallvec",
45224527
"tracing",
45234528
]
45244529

@@ -4538,7 +4543,7 @@ dependencies = [
45384543
"rustc_middle",
45394544
"rustc_span",
45404545
"rustc_trait_selection",
4541-
"smallvec 1.6.1",
4546+
"smallvec",
45424547
"tracing",
45434548
]
45444549

@@ -4588,7 +4593,7 @@ dependencies = [
45884593
"rustc_span",
45894594
"rustc_target",
45904595
"rustc_trait_selection",
4591-
"smallvec 1.6.1",
4596+
"smallvec",
45924597
"tracing",
45934598
]
45944599

@@ -4605,7 +4610,7 @@ dependencies = [
46054610
name = "rustdoc"
46064611
version = "0.0.0"
46074612
dependencies = [
4608-
"arrayvec",
4613+
"arrayvec 0.7.0",
46094614
"expect-test",
46104615
"itertools 0.9.0",
46114616
"minifier",
@@ -4615,7 +4620,7 @@ dependencies = [
46154620
"rustdoc-json-types",
46164621
"serde",
46174622
"serde_json",
4618-
"smallvec 1.6.1",
4623+
"smallvec",
46194624
"tempfile",
46204625
"tracing",
46214626
"tracing-subscriber",
@@ -4961,15 +4966,6 @@ version = "0.4.2"
49614966
source = "registry+https://github.com/rust-lang/crates.io-index"
49624967
checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
49634968

4964-
[[package]]
4965-
name = "smallvec"
4966-
version = "0.6.14"
4967-
source = "registry+https://github.com/rust-lang/crates.io-index"
4968-
checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
4969-
dependencies = [
4970-
"maybe-uninit",
4971-
]
4972-
49734969
[[package]]
49744970
name = "smallvec"
49754971
version = "1.6.1"
@@ -5489,7 +5485,7 @@ dependencies = [
54895485
"serde",
54905486
"serde_json",
54915487
"sharded-slab",
5492-
"smallvec 1.6.1",
5488+
"smallvec",
54935489
"thread_local",
54945490
"tracing",
54955491
"tracing-core",

0 commit comments

Comments
 (0)