From 6e75aae3555e75bf883bd1207ae4edcf588a77ab Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 22:14:44 -0700 Subject: [PATCH 01/15] rustc_data_structures: Drop unused dependency on crossbeam-utils rustc_data_structures has a dependency on crossbeam-utils but never uses it. It appears to have originally had this dependency in order to set the "nightly" feature; however, its other dependencies use a different version of crossbeam-utils, so this doesn't actually affect anything. Furthermore, in current crossbeam-utils, the "nightly" feature has become a no-op. --- Cargo.lock | 1 - compiler/rustc_data_structures/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17378cb4a2d..509409ad272 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3768,7 +3768,6 @@ dependencies = [ "arrayvec", "bitflags", "cfg-if 0.1.10", - "crossbeam-utils 0.8.3", "ena", "indexmap", "jobserver", diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index c35a164bb33..112b94f6e0e 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -17,7 +17,6 @@ rustc_serialize = { path = "../rustc_serialize" } rustc_macros = { path = "../rustc_macros" } rustc_graphviz = { path = "../rustc_graphviz" } cfg-if = "0.1.2" -crossbeam-utils = { version = "0.8", features = ["nightly"] } stable_deref_trait = "1.0.0" rayon = { version = "0.3.1", package = "rustc-rayon" } rayon-core = { version = "0.3.1", package = "rustc-rayon-core" } From e37d6a9baea1ab18a62e5ed0c136267ea5bf4083 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:03:24 -0700 Subject: [PATCH 02/15] rustc_codegen_llvm: Remove unused dependency rustc_feature Unused since commit 622c48e4f1a5bc3727f8ead89767c8a9e367a77e ("Allow making `RUSTC_BOOTSTRAP` conditional on the crate name"). --- Cargo.lock | 1 - compiler/rustc_codegen_llvm/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 509409ad272..ab44e3fb85f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3713,7 +3713,6 @@ dependencies = [ "rustc_codegen_ssa", "rustc_data_structures", "rustc_errors", - "rustc_feature", "rustc_fs_util", "rustc_hir", "rustc_incremental", diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml index d0eb6913acc..98d29346950 100644 --- a/compiler/rustc_codegen_llvm/Cargo.toml +++ b/compiler/rustc_codegen_llvm/Cargo.toml @@ -21,7 +21,6 @@ rustc_attr = { path = "../rustc_attr" } rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } -rustc_feature = { path = "../rustc_feature" } rustc_fs_util = { path = "../rustc_fs_util" } rustc_hir = { path = "../rustc_hir" } rustc_incremental = { path = "../rustc_incremental" } From aadbf75283856326ed1323b6d490338f05e06646 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:05:14 -0700 Subject: [PATCH 03/15] rustc_codegen_llvm: Remove unused dependency rustc_incremental Unused since commit f141acf0678139ac31375d02feebcc2be220715b ("Move finalize_session_directory call out of cg_llvm"). --- Cargo.lock | 1 - compiler/rustc_codegen_llvm/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab44e3fb85f..83dd2c0a89f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3715,7 +3715,6 @@ dependencies = [ "rustc_errors", "rustc_fs_util", "rustc_hir", - "rustc_incremental", "rustc_index", "rustc_llvm", "rustc_metadata", diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml index 98d29346950..d78af9d413e 100644 --- a/compiler/rustc_codegen_llvm/Cargo.toml +++ b/compiler/rustc_codegen_llvm/Cargo.toml @@ -23,7 +23,6 @@ rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } rustc_fs_util = { path = "../rustc_fs_util" } rustc_hir = { path = "../rustc_hir" } -rustc_incremental = { path = "../rustc_incremental" } rustc_index = { path = "../rustc_index" } rustc_llvm = { path = "../rustc_llvm" } rustc_metadata = { path = "../rustc_metadata" } From 8f7839f7229b8118d3737182dc122edacd4a8c71 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:08:19 -0700 Subject: [PATCH 04/15] rustc_driver: Remove unused dependencies rustc_mir_build and rustc_typeck Unused since commit dc3eabd48700863075bd986a497fbe4f227aa33b ("Store THIR in `IndexVec`s instead of an `Arena`"). --- Cargo.lock | 2 -- compiler/rustc_driver/Cargo.toml | 2 -- 2 files changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83dd2c0a89f..2bff899a442 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3808,7 +3808,6 @@ dependencies = [ "rustc_metadata", "rustc_middle", "rustc_mir", - "rustc_mir_build", "rustc_parse", "rustc_plugin_impl", "rustc_save_analysis", @@ -3816,7 +3815,6 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "rustc_typeck", "tracing", "tracing-subscriber", "tracing-tree", diff --git a/compiler/rustc_driver/Cargo.toml b/compiler/rustc_driver/Cargo.toml index c521f2041d8..93c6ec04e4f 100644 --- a/compiler/rustc_driver/Cargo.toml +++ b/compiler/rustc_driver/Cargo.toml @@ -34,8 +34,6 @@ rustc_interface = { path = "../rustc_interface" } rustc_serialize = { path = "../rustc_serialize" } rustc_ast = { path = "../rustc_ast" } rustc_span = { path = "../rustc_span" } -rustc_mir_build = { path = "../rustc_mir_build" } -rustc_typeck = { path = "../rustc_typeck" } [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["consoleapi", "debugapi", "processenv"] } From b060ba93b9cf59a386a171e279d494d754981532 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:19:18 -0700 Subject: [PATCH 05/15] rustc_infer: Remove unused dependency rustc_graphviz Unused since commit 7d73e4cc47f295e5b68fa7aa86688cabfd3c7eea ("Remove ReScope"). --- Cargo.lock | 1 - compiler/rustc_infer/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bff899a442..26ce1ef6cce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3943,7 +3943,6 @@ dependencies = [ "rustc_ast", "rustc_data_structures", "rustc_errors", - "rustc_graphviz", "rustc_hir", "rustc_index", "rustc_macros", diff --git a/compiler/rustc_infer/Cargo.toml b/compiler/rustc_infer/Cargo.toml index a75ad7b31a6..f669925f1c9 100644 --- a/compiler/rustc_infer/Cargo.toml +++ b/compiler/rustc_infer/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" doctest = false [dependencies] -rustc_graphviz = { path = "../rustc_graphviz" } tracing = "0.1" rustc_middle = { path = "../rustc_middle" } rustc_data_structures = { path = "../rustc_data_structures" } From 40cc27849af4d955a1737b05a56dd0fe2dfe5ea7 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:20:16 -0700 Subject: [PATCH 06/15] rustc_infer: Remove unused dependency rustc_ast Unused since commit 50e1ae15e9f3035b06bae00e1b1dc7a358546d3e ("Use ty::{IntTy,UintTy,FloatTy} in rustc"). --- Cargo.lock | 1 - compiler/rustc_infer/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26ce1ef6cce..164da18d393 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3940,7 +3940,6 @@ dependencies = [ name = "rustc_infer" version = "0.0.0" dependencies = [ - "rustc_ast", "rustc_data_structures", "rustc_errors", "rustc_hir", diff --git a/compiler/rustc_infer/Cargo.toml b/compiler/rustc_infer/Cargo.toml index f669925f1c9..933373150c1 100644 --- a/compiler/rustc_infer/Cargo.toml +++ b/compiler/rustc_infer/Cargo.toml @@ -20,4 +20,3 @@ rustc_serialize = { path = "../rustc_serialize" } rustc_span = { path = "../rustc_span" } rustc_target = { path = "../rustc_target" } smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } -rustc_ast = { path = "../rustc_ast" } From b836ecd83adfb6b61ebc389a15ed8bbf080ae1ee Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:24:00 -0700 Subject: [PATCH 07/15] rustc_interface: Remove unused dependency rustc_index Unused since commit cd7a011f37c51d6cb367e87c37b4d7bc464da09d ("Don't duplicate the extern providers once for each crate"). --- Cargo.lock | 1 - compiler/rustc_interface/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 164da18d393..9a6fbc00b15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3973,7 +3973,6 @@ dependencies = [ "rustc_expand", "rustc_hir", "rustc_incremental", - "rustc_index", "rustc_lint", "rustc_metadata", "rustc_middle", diff --git a/compiler/rustc_interface/Cargo.toml b/compiler/rustc_interface/Cargo.toml index 194464dd0bf..85493978d9d 100644 --- a/compiler/rustc_interface/Cargo.toml +++ b/compiler/rustc_interface/Cargo.toml @@ -31,7 +31,6 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } rustc_symbol_mangling = { path = "../rustc_symbol_mangling" } rustc_codegen_llvm = { path = "../rustc_codegen_llvm", optional = true } rustc_hir = { path = "../rustc_hir" } -rustc_index = { path = "../rustc_index" } rustc_metadata = { path = "../rustc_metadata" } rustc_mir = { path = "../rustc_mir" } rustc_mir_build = { path = "../rustc_mir_build" } From b29b3c1879aa743b9430dc8c5e3ec722b9a2b2d1 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:32:24 -0700 Subject: [PATCH 08/15] rustc_lint_defs: Remove apparently unused dependency on tracing (as "log") --- Cargo.lock | 1 - compiler/rustc_lint_defs/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a6fbc00b15..9d543c40f55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4040,7 +4040,6 @@ dependencies = [ "rustc_serialize", "rustc_span", "rustc_target", - "tracing", ] [[package]] diff --git a/compiler/rustc_lint_defs/Cargo.toml b/compiler/rustc_lint_defs/Cargo.toml index f909f159784..292833843e7 100644 --- a/compiler/rustc_lint_defs/Cargo.toml +++ b/compiler/rustc_lint_defs/Cargo.toml @@ -5,7 +5,6 @@ version = "0.0.0" edition = "2018" [dependencies] -log = { package = "tracing", version = "0.1" } rustc_ast = { path = "../rustc_ast" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_span = { path = "../rustc_span" } From 70e2683397978ecee22e6162b1bc2f0fbedb4913 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:34:28 -0700 Subject: [PATCH 09/15] rustc_metadata: Remove unused dependency stable_deref_trait Unused since commit 8331dbe6d023a168334a7a46f15731c6bc1baf1e ("Add an Mmap wrapper to rustc_data_structures"). --- Cargo.lock | 1 - compiler/rustc_metadata/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d543c40f55..9b88144d54f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4083,7 +4083,6 @@ dependencies = [ "rustc_target", "smallvec", "snap", - "stable_deref_trait", "tracing", "winapi 0.3.9", ] diff --git a/compiler/rustc_metadata/Cargo.toml b/compiler/rustc_metadata/Cargo.toml index 29fa0b70069..14b4ebf0736 100644 --- a/compiler/rustc_metadata/Cargo.toml +++ b/compiler/rustc_metadata/Cargo.toml @@ -23,7 +23,6 @@ rustc_target = { path = "../rustc_target" } rustc_index = { path = "../rustc_index" } rustc_macros = { path = "../rustc_macros" } rustc_serialize = { path = "../rustc_serialize" } -stable_deref_trait = "1.0.0" rustc_ast = { path = "../rustc_ast" } rustc_expand = { path = "../rustc_expand" } rustc_span = { path = "../rustc_span" } From 20cedd192532a511165a4ceb867e6c7119ba27c5 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:36:22 -0700 Subject: [PATCH 10/15] rustc_middle: Remove unused dependency measureme Unused since commit 4581d16bcbea9273b6755dd24a884a234a0dc2f7 ("Move the query system to rustc_query_impl."). --- Cargo.lock | 1 - compiler/rustc_middle/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b88144d54f..3c0f1c9dc2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4093,7 +4093,6 @@ version = "0.0.0" dependencies = [ "bitflags", "chalk-ir", - "measureme", "polonius-engine", "rustc-rayon-core", "rustc_apfloat", diff --git a/compiler/rustc_middle/Cargo.toml b/compiler/rustc_middle/Cargo.toml index 8cb30e72f79..90ad0256aeb 100644 --- a/compiler/rustc_middle/Cargo.toml +++ b/compiler/rustc_middle/Cargo.toml @@ -28,6 +28,5 @@ rustc_ast = { path = "../rustc_ast" } rustc_span = { path = "../rustc_span" } chalk-ir = "0.55.0" smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } -measureme = "9.1.0" rustc_session = { path = "../rustc_session" } rustc_type_ir = { path = "../rustc_type_ir" } From 7d75cac8e649636264ee31c4b5f31237c3fecba7 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:37:55 -0700 Subject: [PATCH 11/15] rustc_parse: Remove unused dependency smallvec Unused since commit 530a629635030c47f9d7886bb20a1959fa0198db ("Remove pretty-print/reparse hack, and add derive-specific hack"). --- Cargo.lock | 1 - compiler/rustc_parse/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c0f1c9dc2d..0c1f372968c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4182,7 +4182,6 @@ dependencies = [ "rustc_lexer", "rustc_session", "rustc_span", - "smallvec", "tracing", "unicode-normalization", ] diff --git a/compiler/rustc_parse/Cargo.toml b/compiler/rustc_parse/Cargo.toml index c887729c355..60c21757194 100644 --- a/compiler/rustc_parse/Cargo.toml +++ b/compiler/rustc_parse/Cargo.toml @@ -19,4 +19,3 @@ rustc_session = { path = "../rustc_session" } rustc_span = { path = "../rustc_span" } rustc_ast = { path = "../rustc_ast" } unicode-normalization = "0.1.11" -smallvec = { version = "1.6.1", features = ["union", "may_dangle"] } From f7460121dc25b18ea6020bafd5afbd030b6e0394 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:39:41 -0700 Subject: [PATCH 12/15] rustc_passes: Remove unused dependency rustc_trait_selection Unused since commit 6a32e794c2180a514ad80d3a481300b9afe0b536 ("stabilize union with 'ManuallyDrop' fields and 'impl Drop for Union'"). --- Cargo.lock | 1 - compiler/rustc_passes/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c1f372968c..015c0fe1be1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4211,7 +4211,6 @@ dependencies = [ "rustc_session", "rustc_span", "rustc_target", - "rustc_trait_selection", "tracing", ] diff --git a/compiler/rustc_passes/Cargo.toml b/compiler/rustc_passes/Cargo.toml index 4069fb2127e..c69d4886bd6 100644 --- a/compiler/rustc_passes/Cargo.toml +++ b/compiler/rustc_passes/Cargo.toml @@ -17,6 +17,5 @@ rustc_target = { path = "../rustc_target" } rustc_ast = { path = "../rustc_ast" } rustc_serialize = { path = "../rustc_serialize" } rustc_span = { path = "../rustc_span" } -rustc_trait_selection = { path = "../rustc_trait_selection" } rustc_lexer = { path = "../rustc_lexer" } rustc_ast_pretty = { path = "../rustc_ast_pretty" } From f20aec4cbdacb2a066724fa41506383bd5c5dc67 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:41:40 -0700 Subject: [PATCH 13/15] rustc_session: Remove unused dependency bitflags Unused since commit 64af7eae1ea25102c8197f9f190ee65ddc4f8a10 ("Move SanitizerSet to rustc_target"). --- Cargo.lock | 1 - compiler/rustc_session/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 015c0fe1be1..e6069cc4b99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4341,7 +4341,6 @@ dependencies = [ name = "rustc_session" version = "0.0.0" dependencies = [ - "bitflags", "getopts", "num_cpus", "rustc_ast", diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml index 4c72920502f..571fd581d3f 100644 --- a/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml @@ -5,7 +5,6 @@ version = "0.0.0" edition = "2018" [dependencies] -bitflags = "1.2.1" getopts = "0.2" rustc_macros = { path = "../rustc_macros" } tracing = "0.1" From e721e15cd2fbb44d500b315b6e9f6837e68adb93 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:43:18 -0700 Subject: [PATCH 14/15] rustc_query_impl: Remove unused dependencies --- Cargo.lock | 7 ------- compiler/rustc_query_impl/Cargo.toml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e6069cc4b99..fd6c7bf3ece 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4250,20 +4250,13 @@ version = "0.0.0" dependencies = [ "measureme", "rustc-rayon-core", - "rustc_ast", - "rustc_attr", "rustc_data_structures", "rustc_errors", - "rustc_feature", "rustc_hir", - "rustc_index", - "rustc_macros", "rustc_middle", "rustc_query_system", "rustc_serialize", - "rustc_session", "rustc_span", - "rustc_target", "tracing", ] diff --git a/compiler/rustc_query_impl/Cargo.toml b/compiler/rustc_query_impl/Cargo.toml index 383e30ca29f..5be06dfdc77 100644 --- a/compiler/rustc_query_impl/Cargo.toml +++ b/compiler/rustc_query_impl/Cargo.toml @@ -11,17 +11,10 @@ doctest = false measureme = "9.0.0" rustc-rayon-core = "0.3.1" tracing = "0.1" -rustc_ast = { path = "../rustc_ast" } -rustc_attr = { path = "../rustc_attr" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_errors = { path = "../rustc_errors" } -rustc_feature = { path = "../rustc_feature" } rustc_hir = { path = "../rustc_hir" } -rustc_index = { path = "../rustc_index" } -rustc_macros = { path = "../rustc_macros" } rustc_middle = { path = "../rustc_middle" } rustc_query_system = { path = "../rustc_query_system" } rustc_span = { path = "../rustc_span" } rustc_serialize = { path = "../rustc_serialize" } -rustc_session = { path = "../rustc_session" } -rustc_target = { path = "../rustc_target" } From 7a9d419af978492da3c678e18db245613f1f2bed Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 24 Jun 2021 23:44:58 -0700 Subject: [PATCH 15/15] rustc_symbol_mangling: Remove unused dependency rustc_ast Unused since commit 50e1ae15e9f3035b06bae00e1b1dc7a358546d3e ("Use ty::{IntTy,UintTy,FloatTy} in rustc"). --- Cargo.lock | 1 - compiler/rustc_symbol_mangling/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fd6c7bf3ece..9fd31ee6393 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4373,7 +4373,6 @@ version = "0.0.0" dependencies = [ "punycode", "rustc-demangle", - "rustc_ast", "rustc_data_structures", "rustc_hir", "rustc_middle", diff --git a/compiler/rustc_symbol_mangling/Cargo.toml b/compiler/rustc_symbol_mangling/Cargo.toml index 3df5f161319..53d4dc2922f 100644 --- a/compiler/rustc_symbol_mangling/Cargo.toml +++ b/compiler/rustc_symbol_mangling/Cargo.toml @@ -12,7 +12,6 @@ tracing = "0.1" punycode = "0.4.0" rustc-demangle = "0.1.18" -rustc_ast = { path = "../rustc_ast" } rustc_span = { path = "../rustc_span" } rustc_middle = { path = "../rustc_middle" } rustc_hir = { path = "../rustc_hir" }