Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 9503ea1

Browse files
borsbors
committed
Auto merge of rust-lang#82103 - Dylan-DPC:rollup-5wv8rid, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - rust-lang#80523 (#[doc(inline)] sym_generated) - rust-lang#80920 (Visit more targets when validating attributes) - rust-lang#81720 (Updated smallvec version due to RUSTSEC-2021-0003) - rust-lang#81891 ([rustdoc-json] Make `header` a vec of modifiers, and FunctionPointer consistent) - rust-lang#81912 (Implement the precise analysis pass for lint `disjoint_capture_drop_reorder`) - rust-lang#81914 (Fixing bad suggestion for `_` in `const` type when a function rust-lang#81885) - rust-lang#81919 (BTreeMap: fix internal comments) - rust-lang#81927 (Add a regression test for rust-lang#32498) - rust-lang#81965 (Fix MIR pretty printer for non-local DefIds) - rust-lang#82029 (Use debug log level for developer oriented logs) - rust-lang#82056 (fix ice (rust-lang#82032)) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5fa22fe + bcb1403 commit 9503ea1

File tree

64 files changed

+903
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+903
-165
lines changed

‎Cargo.lock‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ dependencies = [
593593
"rustc-semver",
594594
"semver 0.11.0",
595595
"serde",
596-
"smallvec 1.4.2",
596+
"smallvec 1.6.1",
597597
"syn",
598598
"toml",
599599
"unicode-normalization",
@@ -2086,7 +2086,7 @@ checksum = "22bf8d885d073610aee20e7fa205c4341ed32a761dbde96da5fd96301a8d3e82"
20862086
dependencies = [
20872087
"parking_lot",
20882088
"rustc-hash",
2089-
"smallvec 1.4.2",
2089+
"smallvec 1.6.1",
20902090
]
20912091

20922092
[[package]]
@@ -2236,7 +2236,7 @@ dependencies = [
22362236
"rustc-workspace-hack",
22372237
"rustc_version",
22382238
"shell-escape",
2239-
"smallvec 1.4.2",
2239+
"smallvec 1.6.1",
22402240
]
22412241

22422242
[[package]]
@@ -2459,7 +2459,7 @@ dependencies = [
24592459
"instant",
24602460
"libc",
24612461
"redox_syscall",
2462-
"smallvec 1.4.2",
2462+
"smallvec 1.6.1",
24632463
"winapi 0.3.9",
24642464
]
24652465

@@ -3110,7 +3110,7 @@ version = "705.0.0"
31103110
source = "registry+https://github.com/rust-lang/crates.io-index"
31113111
checksum = "93575affa286089b92c8208aea4e60fe9fdd251a619a09b566d6e4e2cc123212"
31123112
dependencies = [
3113-
"smallvec 1.4.2",
3113+
"smallvec 1.6.1",
31143114
]
31153115

31163116
[[package]]
@@ -3126,7 +3126,7 @@ dependencies = [
31263126
"rustc-ap-rustc_macros",
31273127
"rustc-ap-rustc_serialize",
31283128
"rustc-ap-rustc_span",
3129-
"smallvec 1.4.2",
3129+
"smallvec 1.6.1",
31303130
"tracing",
31313131
]
31323132

@@ -3201,7 +3201,7 @@ dependencies = [
32013201
"rustc-hash",
32023202
"rustc-rayon",
32033203
"rustc-rayon-core",
3204-
"smallvec 1.4.2",
3204+
"smallvec 1.6.1",
32053205
"stable_deref_trait",
32063206
"stacker",
32073207
"tempfile",
@@ -3249,7 +3249,7 @@ dependencies = [
32493249
"rustc-ap-rustc_serialize",
32503250
"rustc-ap-rustc_session",
32513251
"rustc-ap-rustc_span",
3252-
"smallvec 1.4.2",
3252+
"smallvec 1.6.1",
32533253
"tracing",
32543254
]
32553255

@@ -3337,7 +3337,7 @@ dependencies = [
33373337
"rustc-ap-rustc_lexer",
33383338
"rustc-ap-rustc_session",
33393339
"rustc-ap-rustc_span",
3340-
"smallvec 1.4.2",
3340+
"smallvec 1.6.1",
33413341
"tracing",
33423342
"unicode-normalization",
33433343
]
@@ -3349,7 +3349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
33493349
checksum = "bc232e2a351d8131c8f1386ce372ee22ef7b1b0b897bbf817a8ce4792029a564"
33503350
dependencies = [
33513351
"indexmap",
3352-
"smallvec 1.4.2",
3352+
"smallvec 1.6.1",
33533353
]
33543354

33553355
[[package]]
@@ -3497,8 +3497,8 @@ dependencies = [
34973497
"quote",
34983498
"serde",
34993499
"serde_json",
3500-
"smallvec 0.6.13",
3501-
"smallvec 1.4.2",
3500+
"smallvec 0.6.14",
3501+
"smallvec 1.6.1",
35023502
"syn",
35033503
"url 2.1.1",
35043504
"winapi 0.3.9",
@@ -3509,14 +3509,14 @@ name = "rustc_apfloat"
35093509
version = "0.0.0"
35103510
dependencies = [
35113511
"bitflags",
3512-
"smallvec 1.4.2",
3512+
"smallvec 1.6.1",
35133513
]
35143514

35153515
[[package]]
35163516
name = "rustc_arena"
35173517
version = "0.0.0"
35183518
dependencies = [
3519-
"smallvec 1.4.2",
3519+
"smallvec 1.6.1",
35203520
]
35213521

35223522
[[package]]
@@ -3530,7 +3530,7 @@ dependencies = [
35303530
"rustc_macros",
35313531
"rustc_serialize",
35323532
"rustc_span",
3533-
"smallvec 1.4.2",
3533+
"smallvec 1.6.1",
35343534
"tracing",
35353535
]
35363536

@@ -3548,7 +3548,7 @@ dependencies = [
35483548
"rustc_session",
35493549
"rustc_span",
35503550
"rustc_target",
3551-
"smallvec 1.4.2",
3551+
"smallvec 1.6.1",
35523552
"tracing",
35533553
]
35543554

@@ -3611,7 +3611,7 @@ dependencies = [
36113611
"rustc_session",
36123612
"rustc_span",
36133613
"rustc_target",
3614-
"smallvec 1.4.2",
3614+
"smallvec 1.6.1",
36153615
"tracing",
36163616
]
36173617

@@ -3639,7 +3639,7 @@ dependencies = [
36393639
"rustc_session",
36403640
"rustc_span",
36413641
"rustc_target",
3642-
"smallvec 1.4.2",
3642+
"smallvec 1.6.1",
36433643
"snap",
36443644
"tracing",
36453645
]
@@ -3697,7 +3697,7 @@ dependencies = [
36973697
"rustc_index",
36983698
"rustc_macros",
36993699
"rustc_serialize",
3700-
"smallvec 1.4.2",
3700+
"smallvec 1.6.1",
37013701
"stable_deref_trait",
37023702
"stacker",
37033703
"tempfile",
@@ -3778,7 +3778,7 @@ dependencies = [
37783778
"rustc_serialize",
37793779
"rustc_session",
37803780
"rustc_span",
3781-
"smallvec 1.4.2",
3781+
"smallvec 1.6.1",
37823782
"tracing",
37833783
]
37843784

@@ -3810,7 +3810,7 @@ dependencies = [
38103810
"rustc_serialize",
38113811
"rustc_span",
38123812
"rustc_target",
3813-
"smallvec 1.4.2",
3813+
"smallvec 1.6.1",
38143814
"tracing",
38153815
]
38163816

@@ -3868,7 +3868,7 @@ dependencies = [
38683868
"rustc_session",
38693869
"rustc_span",
38703870
"rustc_target",
3871-
"smallvec 1.4.2",
3871+
"smallvec 1.6.1",
38723872
"tracing",
38733873
]
38743874

@@ -3909,7 +3909,7 @@ dependencies = [
39093909
"rustc_traits",
39103910
"rustc_ty_utils",
39113911
"rustc_typeck",
3912-
"smallvec 1.4.2",
3912+
"smallvec 1.6.1",
39133913
"tempfile",
39143914
"tracing",
39153915
"winapi 0.3.9",
@@ -3999,7 +3999,7 @@ dependencies = [
39993999
"rustc_session",
40004000
"rustc_span",
40014001
"rustc_target",
4002-
"smallvec 1.4.2",
4002+
"smallvec 1.6.1",
40034003
"snap",
40044004
"stable_deref_trait",
40054005
"tracing",
@@ -4031,7 +4031,7 @@ dependencies = [
40314031
"rustc_span",
40324032
"rustc_target",
40334033
"rustc_type_ir",
4034-
"smallvec 1.4.2",
4034+
"smallvec 1.6.1",
40354035
"tracing",
40364036
]
40374037

@@ -4062,7 +4062,7 @@ dependencies = [
40624062
"rustc_span",
40634063
"rustc_target",
40644064
"rustc_trait_selection",
4065-
"smallvec 1.4.2",
4065+
"smallvec 1.6.1",
40664066
"tracing",
40674067
]
40684068

@@ -4085,7 +4085,7 @@ dependencies = [
40854085
"rustc_span",
40864086
"rustc_target",
40874087
"rustc_trait_selection",
4088-
"smallvec 1.4.2",
4088+
"smallvec 1.6.1",
40894089
"tracing",
40904090
]
40914091

@@ -4102,7 +4102,7 @@ dependencies = [
41024102
"rustc_lexer",
41034103
"rustc_session",
41044104
"rustc_span",
4105-
"smallvec 1.4.2",
4105+
"smallvec 1.6.1",
41064106
"tracing",
41074107
"unicode-normalization",
41084108
]
@@ -4178,7 +4178,7 @@ dependencies = [
41784178
"rustc_macros",
41794179
"rustc_serialize",
41804180
"rustc_span",
4181-
"smallvec 1.4.2",
4181+
"smallvec 1.6.1",
41824182
"tracing",
41834183
]
41844184

@@ -4202,7 +4202,7 @@ dependencies = [
42024202
"rustc_middle",
42034203
"rustc_session",
42044204
"rustc_span",
4205-
"smallvec 1.4.2",
4205+
"smallvec 1.6.1",
42064206
"tracing",
42074207
]
42084208

@@ -4231,7 +4231,7 @@ version = "0.0.0"
42314231
dependencies = [
42324232
"indexmap",
42334233
"rustc_macros",
4234-
"smallvec 1.4.2",
4234+
"smallvec 1.6.1",
42354235
]
42364236

42374237
[[package]]
@@ -4328,7 +4328,7 @@ dependencies = [
43284328
"rustc_session",
43294329
"rustc_span",
43304330
"rustc_target",
4331-
"smallvec 1.4.2",
4331+
"smallvec 1.6.1",
43324332
"tracing",
43334333
]
43344334

@@ -4348,7 +4348,7 @@ dependencies = [
43484348
"rustc_middle",
43494349
"rustc_span",
43504350
"rustc_trait_selection",
4351-
"smallvec 1.4.2",
4351+
"smallvec 1.6.1",
43524352
"tracing",
43534353
]
43544354

@@ -4398,7 +4398,7 @@ dependencies = [
43984398
"rustc_span",
43994399
"rustc_target",
44004400
"rustc_trait_selection",
4401-
"smallvec 1.4.2",
4401+
"smallvec 1.6.1",
44024402
"tracing",
44034403
]
44044404

@@ -4425,7 +4425,7 @@ dependencies = [
44254425
"rustdoc-json-types",
44264426
"serde",
44274427
"serde_json",
4428-
"smallvec 1.4.2",
4428+
"smallvec 1.6.1",
44294429
"tempfile",
44304430
]
44314431

@@ -4759,18 +4759,18 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
47594759

47604760
[[package]]
47614761
name = "smallvec"
4762-
version = "0.6.13"
4762+
version = "0.6.14"
47634763
source = "registry+https://github.com/rust-lang/crates.io-index"
4764-
checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
4764+
checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
47654765
dependencies = [
47664766
"maybe-uninit",
47674767
]
47684768

47694769
[[package]]
47704770
name = "smallvec"
4771-
version = "1.4.2"
4771+
version = "1.6.1"
47724772
source = "registry+https://github.com/rust-lang/crates.io-index"
4773-
checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
4773+
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
47744774

47754775
[[package]]
47764776
name = "snap"
@@ -5237,7 +5237,7 @@ dependencies = [
52375237
"serde",
52385238
"serde_json",
52395239
"sharded-slab",
5240-
"smallvec 1.4.2",
5240+
"smallvec 1.6.1",
52415241
"thread_local",
52425242
"tracing",
52435243
"tracing-core",

‎compiler/rustc_apfloat/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ edition = "2018"
66

77
[dependencies]
88
bitflags = "1.2.1"
9-
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
9+
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }

‎compiler/rustc_arena/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ version = "0.0.0"
55
edition = "2018"
66

77
[dependencies]
8-
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
8+
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }

‎compiler/rustc_ast/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ rustc_data_structures = { path = "../rustc_data_structures" }
1515
rustc_index = { path = "../rustc_index" }
1616
rustc_lexer = { path = "../rustc_lexer" }
1717
rustc_macros = { path = "../rustc_macros" }
18-
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
18+
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
1919
bitflags = "1.2.1"

‎compiler/rustc_ast_lowering/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ rustc_span = { path = "../rustc_span" }
1919
rustc_errors = { path = "../rustc_errors" }
2020
rustc_session = { path = "../rustc_session" }
2121
rustc_ast = { path = "../rustc_ast" }
22-
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
22+
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }

‎compiler/rustc_builtin_macros/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ rustc_lexer = { path = "../rustc_lexer" }
1919
rustc_parse = { path = "../rustc_parse" }
2020
rustc_target = { path = "../rustc_target" }
2121
rustc_session = { path = "../rustc_session" }
22-
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
22+
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
2323
rustc_ast = { path = "../rustc_ast" }
2424
rustc_expand = { path = "../rustc_expand" }
2525
rustc_span = { path = "../rustc_span" }

‎compiler/rustc_codegen_llvm/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ rustc_llvm = { path = "../rustc_llvm" }
2929
rustc_session = { path = "../rustc_session" }
3030
rustc_serialize = { path = "../rustc_serialize" }
3131
rustc_target = { path = "../rustc_target" }
32-
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
32+
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
3333
rustc_ast = { path = "../rustc_ast" }
3434
rustc_span = { path = "../rustc_span" }

‎compiler/rustc_data_structures/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ stable_deref_trait = "1.0.0"
2222
rayon = { version = "0.3.0", package = "rustc-rayon" }
2323
rayon-core = { version = "0.3.0", package = "rustc-rayon-core" }
2424
rustc-hash = "1.1.0"
25-
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
25+
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
2626
rustc_index = { path = "../rustc_index", package = "rustc_index" }
2727
bitflags = "1.2.1"
2828
measureme = "9.0.0"

‎compiler/rustc_expand/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ rustc_macros = { path = "../rustc_macros" }
2323
rustc_lexer = { path = "../rustc_lexer" }
2424
rustc_parse = { path = "../rustc_parse" }
2525
rustc_session = { path = "../rustc_session" }
26-
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
26+
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
2727
rustc_ast = { path = "../rustc_ast" }

0 commit comments

Comments
 (0)