about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-03-02 17:39:26 +0800
committerkennytm <kennytm@gmail.com>2019-03-02 22:58:49 +0800
commitc835a0a94db7e68a57b6449497f74cf2f74c0256 (patch)
treeda8cff70b6c9563c819f4632fcc2d251f4e6d360
parent133f97309a82459f751dbf8e3086b73c4d14f23e (diff)
parentc3aab1448070e7c039c204889fe59a1d00456db4 (diff)
downloadrust-c835a0a94db7e68a57b6449497f74cf2f74c0256.tar.gz
rust-c835a0a94db7e68a57b6449497f74cf2f74c0256.zip
Rollup merge of #58842 - mati865:53005, r=alexcrichton
Forbid duplicating Cargo as a dependency

Fixes https://github.com/rust-lang/rust/issues/53005
-rw-r--r--src/tools/tidy/src/deps.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 0169725fa29..f581ce1f5a3 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -378,7 +378,7 @@ fn check_crate_duplicate(resolve: &Resolve, bad: &mut bool) {
         // to accidentally sneak into our dependency graph, in order to ensure we keep our CI times
         // under control.
 
-        // "cargo", // FIXME(#53005)
+        "cargo",
         "rustc-ap-syntax",
     ];
     let mut name_to_id: HashMap<_, Vec<_>> = HashMap::new();