about summary refs log tree commit diff
path: root/src/librustc_query_system
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-04-22 03:50:02 +0000
committerbors <bors@rust-lang.org>2020-04-22 03:50:02 +0000
commit2dc5b602eee35d70e8e6e506a7ea07b6c7e0197d (patch)
tree43279f0eee2bf88591559449b56f87b217873337 /src/librustc_query_system
parent70f4f320b02cfd511c78389a6db1628285277410 (diff)
parent66eaead0e2088e5bad6e5c24287a5f061aab4844 (diff)
Auto merge of #71410 - JohnTitor:rollup-vh6dut5, r=JohnTitor
Rollup of 7 pull requests

Successful merges:

 - #70998 (Suggest `-> impl Trait` and `-> Box<dyn Trait>` on fn that doesn't return)
 - #71236 (Remove unused rustc_serialize::hex module)
 - #71366 (Use assoc int consts3)
 - #71372 (Fix #! (shebang) stripping account space issue)
 - #71384 (Fix stage0.txt version number comment)
 - #71390 (Fix incorrect description of E0690)
 - #71399 (Clean up E0554 explanation)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_query_system')
-rw-r--r--src/librustc_query_system/Cargo.toml1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/librustc_query_system/Cargo.toml b/src/librustc_query_system/Cargo.toml
index 7520da1f32b..6629d841fc8 100644
--- a/src/librustc_query_system/Cargo.toml
+++ b/src/librustc_query_system/Cargo.toml
@@ -15,7 +15,6 @@ rustc-rayon-core = "0.3.0"
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_index = { path = "../librustc_index" }
-rustc_macros = { path = "../librustc_macros" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
 rustc_span = { path = "../librustc_span" }
 parking_lot = "0.10"