Skip to content

Commit

Permalink
Rollup merge of #81720 - klensy:smallvec-update, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
Dylan-DPC authored Feb 14, 2021
2 parents ac1d26b + 93c8ebe commit e3b2655
Show file tree
Hide file tree
Showing 25 changed files with 65 additions and 65 deletions.
80 changes: 40 additions & 40 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ dependencies = [
"rustc-semver",
"semver 0.11.0",
"serde",
"smallvec 1.4.2",
"smallvec 1.6.1",
"syn",
"toml",
"unicode-normalization",
Expand Down Expand Up @@ -2086,7 +2086,7 @@ checksum = "22bf8d885d073610aee20e7fa205c4341ed32a761dbde96da5fd96301a8d3e82"
dependencies = [
"parking_lot",
"rustc-hash",
"smallvec 1.4.2",
"smallvec 1.6.1",
]

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

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

Expand Down Expand Up @@ -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]]
Expand All @@ -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",
]

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
]

Expand Down Expand Up @@ -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",
]
Expand All @@ -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]]
Expand Down Expand Up @@ -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",
Expand All @@ -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]]
Expand All @@ -3530,7 +3530,7 @@ dependencies = [
"rustc_macros",
"rustc_serialize",
"rustc_span",
"smallvec 1.4.2",
"smallvec 1.6.1",
"tracing",
]

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

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

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

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

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

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -3999,7 +3999,7 @@ dependencies = [
"rustc_session",
"rustc_span",
"rustc_target",
"smallvec 1.4.2",
"smallvec 1.6.1",
"snap",
"stable_deref_trait",
"tracing",
Expand Down Expand Up @@ -4031,7 +4031,7 @@ dependencies = [
"rustc_span",
"rustc_target",
"rustc_type_ir",
"smallvec 1.4.2",
"smallvec 1.6.1",
"tracing",
]

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

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

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

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

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

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

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

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

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

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -5237,7 +5237,7 @@ dependencies = [
"serde",
"serde_json",
"sharded-slab",
"smallvec 1.4.2",
"smallvec 1.6.1",
"thread_local",
"tracing",
"tracing-core",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_apfloat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion compiler/rustc_arena/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion compiler/rustc_ast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion compiler/rustc_ast_lowering/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion compiler/rustc_builtin_macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_expand/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Loading

0 comments on commit e3b2655

Please sign in to comment.