From abe7c07e8c79d8a2243cac3f6bc766472e839598 Mon Sep 17 00:00:00 2001 From: The8472 Date: Sun, 7 Nov 2021 15:52:47 +0100 Subject: [PATCH 1/4] [experiment] perf-test smallvec optimizations --- Cargo.lock | 79 +++++++++++---------- compiler/rustc_apfloat/Cargo.toml | 2 +- compiler/rustc_arena/Cargo.toml | 2 +- compiler/rustc_ast/Cargo.toml | 2 +- compiler/rustc_ast_lowering/Cargo.toml | 2 +- compiler/rustc_borrowck/Cargo.toml | 2 +- compiler/rustc_builtin_macros/Cargo.toml | 2 +- compiler/rustc_codegen_cranelift/Cargo.lock | 5 ++ compiler/rustc_codegen_cranelift/Cargo.toml | 3 + compiler/rustc_codegen_llvm/Cargo.toml | 2 +- compiler/rustc_codegen_ssa/Cargo.toml | 2 +- compiler/rustc_data_structures/Cargo.toml | 2 +- compiler/rustc_expand/Cargo.toml | 2 +- compiler/rustc_hir/Cargo.toml | 2 +- compiler/rustc_infer/Cargo.toml | 2 +- compiler/rustc_interface/Cargo.toml | 2 +- compiler/rustc_metadata/Cargo.toml | 2 +- compiler/rustc_middle/Cargo.toml | 2 +- compiler/rustc_mir_build/Cargo.toml | 2 +- compiler/rustc_mir_dataflow/Cargo.toml | 2 +- compiler/rustc_mir_transform/Cargo.toml | 2 +- compiler/rustc_monomorphize/Cargo.toml | 2 +- compiler/rustc_query_system/Cargo.toml | 2 +- compiler/rustc_resolve/Cargo.toml | 2 +- compiler/rustc_serialize/Cargo.toml | 2 +- compiler/rustc_trait_selection/Cargo.toml | 2 +- compiler/rustc_traits/Cargo.toml | 2 +- compiler/rustc_typeck/Cargo.toml | 2 +- src/tools/tidy/src/extdeps.rs | 5 +- 29 files changed, 79 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51ed441d0dbe7..ffd61bdee1a7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2160,7 +2160,7 @@ dependencies = [ "parking_lot", "perf-event-open-sys", "rustc-hash", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2174,7 +2174,7 @@ dependencies = [ "parking_lot", "perf-event-open-sys", "rustc-hash", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2286,7 +2286,7 @@ dependencies = [ "rustc-workspace-hack", "rustc_version 0.4.0", "shell-escape", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2530,7 +2530,7 @@ dependencies = [ "instant", "libc", "redox_syscall", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi", ] @@ -3224,7 +3224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "550ca1a0925d31a0af089b18c89f5adf3b286e319e3e1f1a5204c21bd2f17371" dependencies = [ "rustc-ap-rustc_data_structures", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3240,7 +3240,7 @@ dependencies = [ "rustc-ap-rustc_macros", "rustc-ap-rustc_serialize", "rustc-ap-rustc_span", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", ] @@ -3279,7 +3279,7 @@ dependencies = [ "rustc-hash", "rustc-rayon", "rustc-rayon-core", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "stable_deref_trait", "stacker", "tempfile", @@ -3391,7 +3391,7 @@ dependencies = [ "rustc-ap-rustc_lexer", "rustc-ap-rustc_session", "rustc-ap-rustc_span", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "unicode-normalization", ] @@ -3403,7 +3403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f741f8e9aee6323fbe127329490608a5a250cc0072ac91e684ef62518cdb1ff" dependencies = [ "indexmap", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3554,7 +3554,7 @@ dependencies = [ "rand_core 0.5.1", "serde", "serde_json", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "syn", "url 2.2.2", "winapi", @@ -3565,7 +3565,7 @@ name = "rustc_apfloat" version = "0.0.0" dependencies = [ "bitflags", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", ] [[package]] @@ -3573,7 +3573,7 @@ name = "rustc_arena" version = "0.0.0" dependencies = [ "rustc_data_structures", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", ] [[package]] @@ -3587,7 +3587,7 @@ dependencies = [ "rustc_macros", "rustc_serialize", "rustc_span", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -3606,7 +3606,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -3676,7 +3676,7 @@ dependencies = [ "rustc_target", "rustc_trait_selection", "rustc_traits", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -3697,7 +3697,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -3727,7 +3727,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "snap", "tracing", ] @@ -3762,7 +3762,7 @@ dependencies = [ "rustc_span", "rustc_symbol_mangling", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tempfile", "tracing", ] @@ -3811,7 +3811,7 @@ dependencies = [ "rustc_index", "rustc_macros", "rustc_serialize", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "stable_deref_trait", "stacker", "tempfile", @@ -3893,7 +3893,7 @@ dependencies = [ "rustc_serialize", "rustc_session", "rustc_span", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -3926,7 +3926,7 @@ dependencies = [ "rustc_serialize", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -3983,7 +3983,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4029,7 +4029,7 @@ dependencies = [ "rustc_traits", "rustc_ty_utils", "rustc_typeck", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tempfile", "tracing", "winapi", @@ -4120,7 +4120,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "snap", "tracing", "winapi", @@ -4156,7 +4156,7 @@ dependencies = [ "rustc_span", "rustc_target", "rustc_type_ir", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4179,7 +4179,7 @@ dependencies = [ "rustc_span", "rustc_target", "rustc_trait_selection", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4199,7 +4199,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4224,7 +4224,7 @@ dependencies = [ "rustc_span", "rustc_target", "rustc_trait_selection", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4240,7 +4240,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4360,7 +4360,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4385,7 +4385,7 @@ dependencies = [ "rustc_query_system", "rustc_session", "rustc_span", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4414,7 +4414,7 @@ version = "0.0.0" dependencies = [ "indexmap", "rustc_macros", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", ] [[package]] @@ -4513,7 +4513,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4533,7 +4533,7 @@ dependencies = [ "rustc_middle", "rustc_span", "rustc_trait_selection", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4585,7 +4585,7 @@ dependencies = [ "rustc_target", "rustc_trait_selection", "rustc_ty_utils", - "smallvec", + "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", "tracing", ] @@ -4621,7 +4621,7 @@ dependencies = [ "rustdoc-json-types", "serde", "serde_json", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile", "tera", "tracing", @@ -4955,6 +4955,11 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +[[package]] +name = "smallvec" +version = "1.7.0" +source = "git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from#b0e617c85ccb5a410c07e00c887d0ffd327b296a" + [[package]] name = "snap" version = "1.0.1" @@ -5466,7 +5471,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec", + "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local", "tracing", "tracing-core", diff --git a/compiler/rustc_apfloat/Cargo.toml b/compiler/rustc_apfloat/Cargo.toml index bb01d4f51b899..2b1905555569e 100644 --- a/compiler/rustc_apfloat/Cargo.toml +++ b/compiler/rustc_apfloat/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" [dependencies] bitflags = "1.2.1" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } diff --git a/compiler/rustc_arena/Cargo.toml b/compiler/rustc_arena/Cargo.toml index 33ccd0445030f..7d7047cbc0f12 100644 --- a/compiler/rustc_arena/Cargo.toml +++ b/compiler/rustc_arena/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" [dependencies] rustc_data_structures = { path = "../rustc_data_structures" } -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } diff --git a/compiler/rustc_ast/Cargo.toml b/compiler/rustc_ast/Cargo.toml index 58b967a370415..bdf98e5b56f62 100644 --- a/compiler/rustc_ast/Cargo.toml +++ b/compiler/rustc_ast/Cargo.toml @@ -14,5 +14,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.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } bitflags = "1.2.1" diff --git a/compiler/rustc_ast_lowering/Cargo.toml b/compiler/rustc_ast_lowering/Cargo.toml index 7989af24d9986..4446ac364873f 100644 --- 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.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } diff --git a/compiler/rustc_borrowck/Cargo.toml b/compiler/rustc_borrowck/Cargo.toml index 75e9c69af4e5c..d64bb4bfdfb97 100644 --- a/compiler/rustc_borrowck/Cargo.toml +++ b/compiler/rustc_borrowck/Cargo.toml @@ -11,7 +11,7 @@ either = "1.5.0" itertools = "0.9" tracing = "0.1" polonius-engine = "0.13.0" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } rustc_graphviz = { path = "../rustc_graphviz" } diff --git a/compiler/rustc_builtin_macros/Cargo.toml b/compiler/rustc_builtin_macros/Cargo.toml index fd34f947f72c0..cd26d8c4a25c5 100644 --- a/compiler/rustc_builtin_macros/Cargo.toml +++ b/compiler/rustc_builtin_macros/Cargo.toml @@ -18,7 +18,7 @@ rustc_lexer = { path = "../rustc_lexer" } rustc_parse = { path = "../rustc_parse" } rustc_target = { path = "../rustc_target" } rustc_session = { path = "../rustc_session" } -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_ast = { path = "../rustc_ast" } rustc_expand = { path = "../rustc_expand" } rustc_span = { path = "../rustc_span" } diff --git a/compiler/rustc_codegen_cranelift/Cargo.lock b/compiler/rustc_codegen_cranelift/Cargo.lock index 4afddf76869de..1d24b693be59b 100644 --- a/compiler/rustc_codegen_cranelift/Cargo.lock +++ b/compiler/rustc_codegen_cranelift/Cargo.lock @@ -302,3 +302,8 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[patch.unused]] +name = "smallvec" +version = "1.7.0" +source = "git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from#b0e617c85ccb5a410c07e00c887d0ffd327b296a" diff --git a/compiler/rustc_codegen_cranelift/Cargo.toml b/compiler/rustc_codegen_cranelift/Cargo.toml index 61d40702a3284..c284a6b6a7e80 100644 --- a/compiler/rustc_codegen_cranelift/Cargo.toml +++ b/compiler/rustc_codegen_cranelift/Cargo.toml @@ -35,6 +35,9 @@ smallvec = "1.6.1" #[patch.crates-io] #gimli = { path = "../" } +[patch.'crates-io'] +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from" } + [features] # Enable features not ready to be enabled when compiling as part of rustc unstable-features = ["jit", "inline_asm"] diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml index 5f3f533447532..c514697bfaa98 100644 --- a/compiler/rustc_codegen_llvm/Cargo.toml +++ b/compiler/rustc_codegen_llvm/Cargo.toml @@ -30,6 +30,6 @@ rustc_query_system = { path = "../rustc_query_system" } rustc_session = { path = "../rustc_session" } rustc_serialize = { path = "../rustc_serialize" } rustc_target = { path = "../rustc_target" } -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_ast = { path = "../rustc_ast" } rustc_span = { path = "../rustc_span" } diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml index 83dd625611057..f468ffcf00b0d 100644 --- a/compiler/rustc_codegen_ssa/Cargo.toml +++ b/compiler/rustc_codegen_ssa/Cargo.toml @@ -15,7 +15,7 @@ libc = "0.2.50" jobserver = "0.1.22" tempfile = "3.2" pathdiff = "0.2.0" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } regex = "1.4" rustc_serialize = { path = "../rustc_serialize" } diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index e3395df35908c..a54d1f6faaccc 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -20,7 +20,7 @@ stable_deref_trait = "1.0.0" rayon = { version = "0.3.1", package = "rustc-rayon" } rayon-core = { version = "0.3.1", package = "rustc-rayon-core" } rustc-hash = "1.1.0" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_index = { path = "../rustc_index", package = "rustc_index" } bitflags = "1.2.1" measureme = "10.0.0" diff --git a/compiler/rustc_expand/Cargo.toml b/compiler/rustc_expand/Cargo.toml index 45237ab2e9f25..73f5dd12f7d15 100644 --- a/compiler/rustc_expand/Cargo.toml +++ b/compiler/rustc_expand/Cargo.toml @@ -22,5 +22,5 @@ rustc_macros = { path = "../rustc_macros" } rustc_lexer = { path = "../rustc_lexer" } rustc_parse = { path = "../rustc_parse" } rustc_session = { path = "../rustc_session" } -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_ast = { path = "../rustc_ast" } diff --git a/compiler/rustc_hir/Cargo.toml b/compiler/rustc_hir/Cargo.toml index 41c63440ba3cd..258a2d97f4dd7 100644 --- a/compiler/rustc_hir/Cargo.toml +++ b/compiler/rustc_hir/Cargo.toml @@ -16,5 +16,5 @@ rustc_span = { path = "../rustc_span" } rustc_serialize = { path = "../rustc_serialize" } rustc_ast = { path = "../rustc_ast" } tracing = "0.1" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } odht = { version = "0.3.1", features = ["nightly"] } diff --git a/compiler/rustc_infer/Cargo.toml b/compiler/rustc_infer/Cargo.toml index f87ea43b1a72c..998350c8315d2 100644 --- a/compiler/rustc_infer/Cargo.toml +++ b/compiler/rustc_infer/Cargo.toml @@ -18,4 +18,4 @@ rustc_session = { path = "../rustc_session" } rustc_serialize = { path = "../rustc_serialize" } rustc_span = { path = "../rustc_span" } rustc_target = { path = "../rustc_target" } -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } diff --git a/compiler/rustc_interface/Cargo.toml b/compiler/rustc_interface/Cargo.toml index 07af2201f5fc2..ff19bfc4e305a 100644 --- a/compiler/rustc_interface/Cargo.toml +++ b/compiler/rustc_interface/Cargo.toml @@ -11,7 +11,7 @@ libc = "0.2" tracing = "0.1" rustc-rayon-core = "0.3.1" rayon = { version = "0.3.1", package = "rustc-rayon" } -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_ast = { path = "../rustc_ast" } rustc_attr = { path = "../rustc_attr" } rustc_borrowck = { path = "../rustc_borrowck" } diff --git a/compiler/rustc_metadata/Cargo.toml b/compiler/rustc_metadata/Cargo.toml index dec77d996f3f2..73c2b284db411 100644 --- a/compiler/rustc_metadata/Cargo.toml +++ b/compiler/rustc_metadata/Cargo.toml @@ -11,7 +11,7 @@ libc = "0.2" odht = { version = "0.3.1", features = ["nightly"] } snap = "1" tracing = "0.1" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_middle = { path = "../rustc_middle" } rustc_attr = { path = "../rustc_attr" } rustc_data_structures = { path = "../rustc_data_structures" } diff --git a/compiler/rustc_middle/Cargo.toml b/compiler/rustc_middle/Cargo.toml index daeccde6024e6..95945a7600cd1 100644 --- a/compiler/rustc_middle/Cargo.toml +++ b/compiler/rustc_middle/Cargo.toml @@ -30,7 +30,7 @@ rustc_serialize = { path = "../rustc_serialize" } rustc_ast = { path = "../rustc_ast" } rustc_span = { path = "../rustc_span" } chalk-ir = "0.55.0" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_session = { path = "../rustc_session" } rustc_type_ir = { path = "../rustc_type_ir" } rand = "0.8.4" diff --git a/compiler/rustc_mir_build/Cargo.toml b/compiler/rustc_mir_build/Cargo.toml index 998b80a36c2f7..0c48b085f17d6 100644 --- a/compiler/rustc_mir_build/Cargo.toml +++ b/compiler/rustc_mir_build/Cargo.toml @@ -23,4 +23,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.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } diff --git a/compiler/rustc_mir_dataflow/Cargo.toml b/compiler/rustc_mir_dataflow/Cargo.toml index ffd7e3cd06bd2..8b2ce618d0df9 100644 --- a/compiler/rustc_mir_dataflow/Cargo.toml +++ b/compiler/rustc_mir_dataflow/Cargo.toml @@ -9,7 +9,7 @@ doctest = false [dependencies] polonius-engine = "0.13.0" regex = "1" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } tracing = "0.1" rustc_ast = { path = "../rustc_ast" } rustc_data_structures = { path = "../rustc_data_structures" } diff --git a/compiler/rustc_mir_transform/Cargo.toml b/compiler/rustc_mir_transform/Cargo.toml index e85d74ef3eaef..baaba5b43b666 100644 --- a/compiler/rustc_mir_transform/Cargo.toml +++ b/compiler/rustc_mir_transform/Cargo.toml @@ -8,7 +8,7 @@ doctest = false [dependencies] itertools = "0.9" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } tracing = "0.1" rustc_ast = { path = "../rustc_ast" } rustc_attr = { path = "../rustc_attr" } diff --git a/compiler/rustc_monomorphize/Cargo.toml b/compiler/rustc_monomorphize/Cargo.toml index f812afe6b62ba..2a266192810ae 100644 --- a/compiler/rustc_monomorphize/Cargo.toml +++ b/compiler/rustc_monomorphize/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" doctest = false [dependencies] -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } tracing = "0.1" rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } diff --git a/compiler/rustc_query_system/Cargo.toml b/compiler/rustc_query_system/Cargo.toml index 898a8caa3ca35..9d86c6e29f889 100644 --- a/compiler/rustc_query_system/Cargo.toml +++ b/compiler/rustc_query_system/Cargo.toml @@ -22,4 +22,4 @@ rustc_session = { path = "../rustc_session" } rustc_span = { path = "../rustc_span" } rustc_target = { path = "../rustc_target" } parking_lot = "0.11" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } diff --git a/compiler/rustc_resolve/Cargo.toml b/compiler/rustc_resolve/Cargo.toml index bd27c16c732a9..e9b1b4f011a22 100644 --- a/compiler/rustc_resolve/Cargo.toml +++ b/compiler/rustc_resolve/Cargo.toml @@ -26,4 +26,4 @@ rustc_metadata = { path = "../rustc_metadata" } rustc_query_system = { path = "../rustc_query_system" } rustc_session = { path = "../rustc_session" } rustc_span = { path = "../rustc_span" } -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } diff --git a/compiler/rustc_serialize/Cargo.toml b/compiler/rustc_serialize/Cargo.toml index 49778f82253bf..b670816188dd7 100644 --- a/compiler/rustc_serialize/Cargo.toml +++ b/compiler/rustc_serialize/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] indexmap = "1" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } [dev-dependencies] rustc_macros = { path = "../rustc_macros" } diff --git a/compiler/rustc_trait_selection/Cargo.toml b/compiler/rustc_trait_selection/Cargo.toml index d59bdae0332cb..0cf48fc2e1148 100644 --- a/compiler/rustc_trait_selection/Cargo.toml +++ b/compiler/rustc_trait_selection/Cargo.toml @@ -23,4 +23,4 @@ rustc_query_system = { path = "../rustc_query_system" } rustc_session = { path = "../rustc_session" } rustc_span = { path = "../rustc_span" } rustc_target = { path = "../rustc_target" } -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } diff --git a/compiler/rustc_traits/Cargo.toml b/compiler/rustc_traits/Cargo.toml index 2e56a1bf6839e..231737235e649 100644 --- a/compiler/rustc_traits/Cargo.toml +++ b/compiler/rustc_traits/Cargo.toml @@ -15,6 +15,6 @@ rustc_span = { path = "../rustc_span" } chalk-ir = "0.55.0" chalk-solve = "0.55.0" chalk-engine = "0.55.0" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_infer = { path = "../rustc_infer" } rustc_trait_selection = { path = "../rustc_trait_selection" } diff --git a/compiler/rustc_typeck/Cargo.toml b/compiler/rustc_typeck/Cargo.toml index 7e570e151c529..9d755dbcaf03c 100644 --- a/compiler/rustc_typeck/Cargo.toml +++ b/compiler/rustc_typeck/Cargo.toml @@ -19,7 +19,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.6.1", features = ["union", "may_dangle"] } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from", features = ["union", "may_dangle"] } rustc_ast = { path = "../rustc_ast" } rustc_span = { path = "../rustc_span" } rustc_index = { path = "../rustc_index" } diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index aad57cacbb41e..fee0931da94db 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -4,7 +4,10 @@ use std::fs; use std::path::Path; /// List of allowed sources for packages. -const ALLOWED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\""]; +const ALLOWED_SOURCES: &[&str] = &[ + "\"registry+https://github.com/rust-lang/crates.io-index\"", + r#""git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from#b0e617c85ccb5a410c07e00c887d0ffd327b296a""#, +]; /// Checks for external package sources. `root` is the path to the directory that contains the /// workspace `Cargo.toml`. From 5bee7d6a860d34fec40304ce06b7f32a406447b5 Mon Sep 17 00:00:00 2001 From: The8472 Date: Tue, 9 Nov 2021 09:23:06 +0100 Subject: [PATCH 2/4] patch top-level cargo.toml --- Cargo.lock | 80 +++++++++++++++++++++++++----------------------------- Cargo.toml | 1 + 2 files changed, 38 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ffd61bdee1a7e..fc01366ede9b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2160,7 +2160,7 @@ dependencies = [ "parking_lot", "perf-event-open-sys", "rustc-hash", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", ] [[package]] @@ -2174,7 +2174,7 @@ dependencies = [ "parking_lot", "perf-event-open-sys", "rustc-hash", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", ] [[package]] @@ -2286,7 +2286,7 @@ dependencies = [ "rustc-workspace-hack", "rustc_version 0.4.0", "shell-escape", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", ] [[package]] @@ -2530,7 +2530,7 @@ dependencies = [ "instant", "libc", "redox_syscall", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", "winapi", ] @@ -3224,7 +3224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "550ca1a0925d31a0af089b18c89f5adf3b286e319e3e1f1a5204c21bd2f17371" dependencies = [ "rustc-ap-rustc_data_structures", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", ] [[package]] @@ -3240,7 +3240,7 @@ dependencies = [ "rustc-ap-rustc_macros", "rustc-ap-rustc_serialize", "rustc-ap-rustc_span", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", "tracing", ] @@ -3279,7 +3279,7 @@ dependencies = [ "rustc-hash", "rustc-rayon", "rustc-rayon-core", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", "stable_deref_trait", "stacker", "tempfile", @@ -3391,7 +3391,7 @@ dependencies = [ "rustc-ap-rustc_lexer", "rustc-ap-rustc_session", "rustc-ap-rustc_span", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", "tracing", "unicode-normalization", ] @@ -3403,7 +3403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f741f8e9aee6323fbe127329490608a5a250cc0072ac91e684ef62518cdb1ff" dependencies = [ "indexmap", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", ] [[package]] @@ -3554,7 +3554,7 @@ dependencies = [ "rand_core 0.5.1", "serde", "serde_json", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", "syn", "url 2.2.2", "winapi", @@ -3565,7 +3565,7 @@ name = "rustc_apfloat" version = "0.0.0" dependencies = [ "bitflags", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", ] [[package]] @@ -3573,7 +3573,7 @@ name = "rustc_arena" version = "0.0.0" dependencies = [ "rustc_data_structures", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", ] [[package]] @@ -3587,7 +3587,7 @@ dependencies = [ "rustc_macros", "rustc_serialize", "rustc_span", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -3606,7 +3606,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -3676,7 +3676,7 @@ dependencies = [ "rustc_target", "rustc_trait_selection", "rustc_traits", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -3697,7 +3697,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -3727,7 +3727,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "snap", "tracing", ] @@ -3762,7 +3762,7 @@ dependencies = [ "rustc_span", "rustc_symbol_mangling", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tempfile", "tracing", ] @@ -3811,7 +3811,7 @@ dependencies = [ "rustc_index", "rustc_macros", "rustc_serialize", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "stable_deref_trait", "stacker", "tempfile", @@ -3893,7 +3893,7 @@ dependencies = [ "rustc_serialize", "rustc_session", "rustc_span", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -3926,7 +3926,7 @@ dependencies = [ "rustc_serialize", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -3983,7 +3983,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4029,7 +4029,7 @@ dependencies = [ "rustc_traits", "rustc_ty_utils", "rustc_typeck", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tempfile", "tracing", "winapi", @@ -4120,7 +4120,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "snap", "tracing", "winapi", @@ -4156,7 +4156,7 @@ dependencies = [ "rustc_span", "rustc_target", "rustc_type_ir", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4179,7 +4179,7 @@ dependencies = [ "rustc_span", "rustc_target", "rustc_trait_selection", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4199,7 +4199,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4224,7 +4224,7 @@ dependencies = [ "rustc_span", "rustc_target", "rustc_trait_selection", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4240,7 +4240,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4360,7 +4360,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4385,7 +4385,7 @@ dependencies = [ "rustc_query_system", "rustc_session", "rustc_span", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4414,7 +4414,7 @@ version = "0.0.0" dependencies = [ "indexmap", "rustc_macros", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", ] [[package]] @@ -4513,7 +4513,7 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4533,7 +4533,7 @@ dependencies = [ "rustc_middle", "rustc_span", "rustc_trait_selection", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4585,7 +4585,7 @@ dependencies = [ "rustc_target", "rustc_trait_selection", "rustc_ty_utils", - "smallvec 1.7.0 (git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from)", + "smallvec", "tracing", ] @@ -4621,7 +4621,7 @@ dependencies = [ "rustdoc-json-types", "serde", "serde_json", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", "tempfile", "tera", "tracing", @@ -4949,12 +4949,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -[[package]] -name = "smallvec" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" - [[package]] name = "smallvec" version = "1.7.0" @@ -5471,7 +5465,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", "thread_local", "tracing", "tracing-core", diff --git a/Cargo.toml b/Cargo.toml index cae48d7951783..7e93773cede55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,6 +124,7 @@ rustfmt-nightly = { path = "src/tools/rustfmt" } # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on # here rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' } +smallvec = { git = "https://github.com/the8472/rust-smallvec.git", branch = "delegate-vec-extend-from" } # See comments in `library/rustc-std-workspace-core/README.md` for what's going on # here From db7904d892e9b6e82f2da5e28c041bc8e4d374f3 Mon Sep 17 00:00:00 2001 From: The8472 Date: Thu, 11 Nov 2021 23:22:56 +0100 Subject: [PATCH 3/4] bump --- Cargo.lock | 2 +- src/tools/tidy/src/extdeps.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc01366ede9b1..a2a8e874d28a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4952,7 +4952,7 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "smallvec" version = "1.7.0" -source = "git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from#b0e617c85ccb5a410c07e00c887d0ffd327b296a" +source = "git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from#5b6f5d9f3444988173e86b6a6edfc77bc414be8e" [[package]] name = "snap" diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index fee0931da94db..34f30224e3949 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -6,7 +6,7 @@ use std::path::Path; /// List of allowed sources for packages. const ALLOWED_SOURCES: &[&str] = &[ "\"registry+https://github.com/rust-lang/crates.io-index\"", - r#""git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from#b0e617c85ccb5a410c07e00c887d0ffd327b296a""#, + r#""git+https://github.com/the8472/rust-smallvec.git?branch=delegate-vec-extend-from#5b6f5d9f3444988173e86b6a6edfc77bc414be8e""#, ]; /// Checks for external package sources. `root` is the path to the directory that contains the From f91df9b84a962b171bbb2944d7dc81c40d70a221 Mon Sep 17 00:00:00 2001 From: The8472 Date: Sat, 13 Nov 2021 15:00:42 +0100 Subject: [PATCH 4/4] try build without rust-analyzer --- src/bootstrap/configure.py | 2 ++ src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 1 + 2 files changed, 3 insertions(+) diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py index 94424cb4548fa..b433e963e8616 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py @@ -356,6 +356,8 @@ def set(key, value): set('rust.lld', True) set('rust.llvm-tools', True) set('build.extended', True) + elif option.name == 'build.tools': + set('tools', value.split(',')) elif option.name == 'option-checking': # this was handled above pass diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index efc83c6ccab1f..2c1a26cc8432a 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -113,6 +113,7 @@ ENV HOSTS=x86_64-unknown-linux-gnu ENV RUST_CONFIGURE_ARGS \ --enable-full-tools \ + --tools=cargo,src \ --enable-sanitizers \ --enable-profiler \ --enable-compiler-docs \