Rollup merge of #81720 - klensy:smallvec-update, r=Mark-Simulacrum

Updated smallvec version due to RUSTSEC-2021-0003 Hi. Updated Cargo.toml's for smallvec due to RUSTSEC-2021-0003 and Cargo.toml in separate commit. Affected function `SmallVec::insert_many` looks like don't was used directly in rust, but can be somewhere in deps. There should be some mechanism to not to do this kind of things manually, like dependabot. Actually, dependabot supports rust and can check security articles (at least that noted in description).
2021-02-14 16:54:44 +01:00 · 2021-02-14 16:54:44 +01:00 · e3b2655c3a
commit e3b2655c3a
parent ac1d26bcd3 93c8ebe022
25 changed files with 65 additions and 65 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -593,7 +593,7 @@ dependencies = [
 "rustc-semver",
 "semver 0.11.0",
 "serde",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "syn",
 "toml",
 "unicode-normalization",
@ -2086,7 +2086,7 @@ checksum = "22bf8d885d073610aee20e7fa205c4341ed32a761dbde96da5fd96301a8d3e82"
 dependencies = [
 "parking_lot",
 "rustc-hash",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 ]

 [[package]]
@ -2236,7 +2236,7 @@ dependencies = [
 "rustc-workspace-hack",
 "rustc_version",
 "shell-escape",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 ]

 [[package]]
@ -2459,7 +2459,7 @@ dependencies = [
 "instant",
 "libc",
 "redox_syscall",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "winapi 0.3.9",
 ]

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

 [[package]]
@ -3126,7 +3126,7 @@ dependencies = [
 "rustc-ap-rustc_macros",
 "rustc-ap-rustc_serialize",
 "rustc-ap-rustc_span",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -3201,7 +3201,7 @@ dependencies = [
 "rustc-hash",
 "rustc-rayon",
 "rustc-rayon-core",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "stable_deref_trait",
 "stacker",
 "tempfile",
@ -3249,7 +3249,7 @@ dependencies = [
 "rustc-ap-rustc_serialize",
 "rustc-ap-rustc_session",
 "rustc-ap-rustc_span",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -3337,7 +3337,7 @@ dependencies = [
 "rustc-ap-rustc_lexer",
 "rustc-ap-rustc_session",
 "rustc-ap-rustc_span",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 "unicode-normalization",
 ]
@ -3349,7 +3349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc232e2a351d8131c8f1386ce372ee22ef7b1b0b897bbf817a8ce4792029a564"
 dependencies = [
 "indexmap",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 ]

 [[package]]
@ -3497,8 +3497,8 @@ dependencies = [
 "quote",
 "serde",
 "serde_json",
- "smallvec 0.6.13",
- "smallvec 1.4.2",
+ "smallvec 0.6.14",
+ "smallvec 1.6.1",
 "syn",
 "url 2.1.1",
 "winapi 0.3.9",
@ -3509,14 +3509,14 @@ name = "rustc_apfloat"
 version = "0.0.0"
 dependencies = [
 "bitflags",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 ]

 [[package]]
 name = "rustc_arena"
 version = "0.0.0"
 dependencies = [
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 ]

 [[package]]
@ -3530,7 +3530,7 @@ dependencies = [
 "rustc_macros",
 "rustc_serialize",
 "rustc_span",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -3548,7 +3548,7 @@ dependencies = [
 "rustc_session",
 "rustc_span",
 "rustc_target",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -3611,7 +3611,7 @@ dependencies = [
 "rustc_session",
 "rustc_span",
 "rustc_target",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -3639,7 +3639,7 @@ dependencies = [
 "rustc_session",
 "rustc_span",
 "rustc_target",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "snap",
 "tracing",
 ]
@ -3697,7 +3697,7 @@ dependencies = [
 "rustc_index",
 "rustc_macros",
 "rustc_serialize",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "stable_deref_trait",
 "stacker",
 "tempfile",
@ -3778,7 +3778,7 @@ dependencies = [
 "rustc_serialize",
 "rustc_session",
 "rustc_span",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -3810,7 +3810,7 @@ dependencies = [
 "rustc_serialize",
 "rustc_span",
 "rustc_target",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -3868,7 +3868,7 @@ dependencies = [
 "rustc_session",
 "rustc_span",
 "rustc_target",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -3909,7 +3909,7 @@ dependencies = [
 "rustc_traits",
 "rustc_ty_utils",
 "rustc_typeck",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tempfile",
 "tracing",
 "winapi 0.3.9",
@ -3999,7 +3999,7 @@ dependencies = [
 "rustc_session",
 "rustc_span",
 "rustc_target",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "snap",
 "stable_deref_trait",
 "tracing",
@ -4031,7 +4031,7 @@ dependencies = [
 "rustc_span",
 "rustc_target",
 "rustc_type_ir",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -4062,7 +4062,7 @@ dependencies = [
 "rustc_span",
 "rustc_target",
 "rustc_trait_selection",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -4085,7 +4085,7 @@ dependencies = [
 "rustc_span",
 "rustc_target",
 "rustc_trait_selection",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -4102,7 +4102,7 @@ dependencies = [
 "rustc_lexer",
 "rustc_session",
 "rustc_span",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 "unicode-normalization",
 ]
@ -4178,7 +4178,7 @@ dependencies = [
 "rustc_macros",
 "rustc_serialize",
 "rustc_span",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -4202,7 +4202,7 @@ dependencies = [
 "rustc_middle",
 "rustc_session",
 "rustc_span",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -4231,7 +4231,7 @@ version = "0.0.0"
 dependencies = [
 "indexmap",
 "rustc_macros",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 ]

 [[package]]
@ -4328,7 +4328,7 @@ dependencies = [
 "rustc_session",
 "rustc_span",
 "rustc_target",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -4348,7 +4348,7 @@ dependencies = [
 "rustc_middle",
 "rustc_span",
 "rustc_trait_selection",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -4398,7 +4398,7 @@ dependencies = [
 "rustc_span",
 "rustc_target",
 "rustc_trait_selection",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tracing",
 ]

@ -4425,7 +4425,7 @@ dependencies = [
 "rustdoc-json-types",
 "serde",
 "serde_json",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "tempfile",
 ]

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

 [[package]]
 name = "smallvec"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
+checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
 dependencies = [
 "maybe-uninit",
 ]

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

 [[package]]
 name = "snap"
@ -5237,7 +5237,7 @@ dependencies = [
 "serde",
 "serde_json",
 "sharded-slab",
- "smallvec 1.4.2",
+ "smallvec 1.6.1",
 "thread_local",
 "tracing",
 "tracing-core",
--- a/compiler/rustc_apfloat/Cargo.toml
+++ b/compiler/rustc_apfloat/Cargo.toml
@ -6,4 +6,4 @@ edition = "2018"

 [dependencies]
 bitflags = "1.2.1"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_arena/Cargo.toml
+++ b/compiler/rustc_arena/Cargo.toml
@ -5,4 +5,4 @@ version = "0.0.0"
 edition = "2018"

 [dependencies]
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_ast/Cargo.toml
+++ b/compiler/rustc_ast/Cargo.toml
@ -15,5 +15,5 @@ rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_index = { path = "../rustc_index" }
 rustc_lexer = { path = "../rustc_lexer" }
 rustc_macros = { path = "../rustc_macros" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 bitflags = "1.2.1"
--- a/compiler/rustc_ast_lowering/Cargo.toml
+++ b/compiler/rustc_ast_lowering/Cargo.toml
@ -19,4 +19,4 @@ rustc_span = { path = "../rustc_span" }
 rustc_errors = { path = "../rustc_errors" }
 rustc_session = { path = "../rustc_session" }
 rustc_ast = { path = "../rustc_ast" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_builtin_macros/Cargo.toml
+++ b/compiler/rustc_builtin_macros/Cargo.toml
@ -19,7 +19,7 @@ rustc_lexer = { path = "../rustc_lexer" }
 rustc_parse = { path = "../rustc_parse" }
 rustc_target = { path = "../rustc_target" }
 rustc_session = { path = "../rustc_session" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_ast = { path = "../rustc_ast" }
 rustc_expand = { path = "../rustc_expand" }
 rustc_span = { path = "../rustc_span" }
--- a/compiler/rustc_codegen_llvm/Cargo.toml
+++ b/compiler/rustc_codegen_llvm/Cargo.toml
@ -29,6 +29,6 @@ rustc_llvm = { path = "../rustc_llvm" }
 rustc_session = { path = "../rustc_session" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_target = { path = "../rustc_target" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_ast = { path = "../rustc_ast" }
 rustc_span = { path = "../rustc_span" }
--- a/compiler/rustc_data_structures/Cargo.toml
+++ b/compiler/rustc_data_structures/Cargo.toml
@ -22,7 +22,7 @@ stable_deref_trait = "1.0.0"
 rayon = { version = "0.3.0", package = "rustc-rayon" }
 rayon-core = { version = "0.3.0", package = "rustc-rayon-core" }
 rustc-hash = "1.1.0"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_index = { path = "../rustc_index", package = "rustc_index" }
 bitflags = "1.2.1"
 measureme = "9.0.0"
--- a/compiler/rustc_expand/Cargo.toml
+++ b/compiler/rustc_expand/Cargo.toml
@ -23,5 +23,5 @@ rustc_macros = { path = "../rustc_macros" }
 rustc_lexer = { path = "../rustc_lexer" }
 rustc_parse = { path = "../rustc_parse" }
 rustc_session = { path = "../rustc_session" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_ast = { path = "../rustc_ast" }
--- a/compiler/rustc_hir/Cargo.toml
+++ b/compiler/rustc_hir/Cargo.toml
@ -17,4 +17,4 @@ rustc_span = { path = "../rustc_span" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_ast = { path = "../rustc_ast" }
 tracing = "0.1"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_infer/Cargo.toml
+++ b/compiler/rustc_infer/Cargo.toml
@ -20,5 +20,5 @@ rustc_session = { path = "../rustc_session" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_span = { path = "../rustc_span" }
 rustc_target = { path = "../rustc_target" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_ast = { path = "../rustc_ast" }
--- a/compiler/rustc_interface/Cargo.toml
+++ b/compiler/rustc_interface/Cargo.toml
@ -11,7 +11,7 @@ doctest = false
 libc = "0.2"
 tracing = "0.1"
 rayon = { version = "0.3.0", package = "rustc-rayon" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_ast = { path = "../rustc_ast" }
 rustc_attr = { path = "../rustc_attr" }
 rustc_builtin_macros = { path = "../rustc_builtin_macros" }
--- a/compiler/rustc_metadata/Cargo.toml
+++ b/compiler/rustc_metadata/Cargo.toml
@ -12,7 +12,7 @@ libc = "0.2"
 snap = "1"
 tracing = "0.1"
 memmap = "0.7"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_middle = { path = "../rustc_middle" }
 rustc_attr = { path = "../rustc_attr" }
 rustc_data_structures = { path = "../rustc_data_structures" }
--- a/compiler/rustc_middle/Cargo.toml
+++ b/compiler/rustc_middle/Cargo.toml
@ -27,7 +27,7 @@ rustc_serialize = { path = "../rustc_serialize" }
 rustc_ast = { path = "../rustc_ast" }
 rustc_span = { path = "../rustc_span" }
 chalk-ir = "0.55.0"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 measureme = "9.0.0"
 rustc_session = { path = "../rustc_session" }
 rustc_type_ir = { path = "../rustc_type_ir" }
--- a/compiler/rustc_mir/Cargo.toml
+++ b/compiler/rustc_mir/Cargo.toml
@ -31,7 +31,7 @@ rustc_trait_selection = { path = "../rustc_trait_selection" }
 rustc_ast = { path = "../rustc_ast" }
 rustc_span = { path = "../rustc_span" }
 rustc_apfloat = { path = "../rustc_apfloat" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }

 [dev-dependencies]
 coverage_test_macros = { path = "src/transform/coverage/test_macros" }
--- a/compiler/rustc_mir_build/Cargo.toml
+++ b/compiler/rustc_mir_build/Cargo.toml
@ -24,4 +24,4 @@ rustc_span = { path = "../rustc_span" }
 rustc_target = { path = "../rustc_target" }
 rustc_trait_selection = { path = "../rustc_trait_selection" }
 rustc_ast = { path = "../rustc_ast" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_parse/Cargo.toml
+++ b/compiler/rustc_parse/Cargo.toml
@ -19,4 +19,4 @@ rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
 rustc_ast = { path = "../rustc_ast" }
 unicode-normalization = "0.1.11"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_query_system/Cargo.toml
+++ b/compiler/rustc_query_system/Cargo.toml
@ -18,4 +18,4 @@ rustc_index = { path = "../rustc_index" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_span = { path = "../rustc_span" }
 parking_lot = "0.11"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_resolve/Cargo.toml
+++ b/compiler/rustc_resolve/Cargo.toml
@ -26,4 +26,4 @@ rustc_index = { path = "../rustc_index" }
 rustc_metadata = { path = "../rustc_metadata" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_serialize/Cargo.toml
+++ b/compiler/rustc_serialize/Cargo.toml
@ -6,7 +6,7 @@ edition = "2018"

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

 [dev-dependencies]
 rustc_macros = { path = "../rustc_macros" }
--- a/compiler/rustc_trait_selection/Cargo.toml
+++ b/compiler/rustc_trait_selection/Cargo.toml
@ -22,4 +22,4 @@ rustc_macros = { path = "../rustc_macros" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
 rustc_target = { path = "../rustc_target" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
--- a/compiler/rustc_traits/Cargo.toml
+++ b/compiler/rustc_traits/Cargo.toml
@ -16,6 +16,6 @@ rustc_span = { path = "../rustc_span" }
 chalk-ir = "0.55.0"
 chalk-solve = "0.55.0"
 chalk-engine = "0.55.0"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_infer = { path = "../rustc_infer" }
 rustc_trait_selection = { path = "../rustc_trait_selection" }
--- a/compiler/rustc_typeck/Cargo.toml
+++ b/compiler/rustc_typeck/Cargo.toml
@ -20,7 +20,7 @@ rustc_hir = { path = "../rustc_hir" }
 rustc_hir_pretty = { path = "../rustc_hir_pretty" }
 rustc_target = { path = "../rustc_target" }
 rustc_session = { path = "../rustc_session" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
 rustc_ast = { path = "../rustc_ast" }
 rustc_span = { path = "../rustc_span" }
 rustc_index = { path = "../rustc_index" }
--- a/src/librustdoc/Cargo.toml
+++ b/src/librustdoc/Cargo.toml
@ -14,7 +14,7 @@ minifier = "0.0.33"
 rayon = { version = "0.3.0", package = "rustc-rayon" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-smallvec = "1.0"
+smallvec = "1.6.1"
 tempfile = "3"
 itertools = "0.9"
 regex = "1"
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@ -71,8 +71,8 @@ proc-macro2 = { version = "1", features = ["default"] }
 quote = { version = "1", features = ["default"] }
 serde = { version = "1.0.82", features = ['derive'] }
 serde_json = { version = "1.0.31", features = ["raw_value", "unbounded_depth"] }
-smallvec-0_6 = { package = "smallvec", version = "0.6", features = ['union', 'may_dangle'] }
-smallvec = { version = "1.0", features = ['union', 'may_dangle'] }
+smallvec-0_6 = { package = "smallvec", version = "0.6.14", features = ['union', 'may_dangle'] }
+smallvec = { version = "1.6.1", features = ['union', 'may_dangle'] }
 syn = { version = "1", features = ['fold', 'full', 'extra-traits', 'visit', 'visit-mut'] }
 url = { version = "2.0", features = ['serde'] }