From fbee2e7af656cfb68d363bc675d78562f9b7272b Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Fri, 14 Sep 2018 15:35:36 -0400 Subject: [PATCH] remove debs leading to remove now unused crates --- tests/testsuite/resolve.rs | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/tests/testsuite/resolve.rs b/tests/testsuite/resolve.rs index b461959b4..e79cd5c7b 100644 --- a/tests/testsuite/resolve.rs +++ b/tests/testsuite/resolve.rs @@ -104,7 +104,7 @@ impl<'a> ToPkgId for (&'a str, String) { } macro_rules! pkg { - ($pkgid:expr => [$($deps:expr),* $(,)* ]) => ({ + ($pkgid:expr => [$($deps:expr),+ $(,)* ]) => ({ let d: Vec = vec![$($deps.to_dep()),+]; let pkgid = $pkgid.to_pkgid(); let link = if pkgid.name().ends_with("-sys") {Some(pkgid.name().as_str())} else {None}; @@ -1079,44 +1079,25 @@ fn dont_yet_know_the_problem_3() { // minimized bug found in: // https://github.com/rust-lang/cargo/commit/003c29b0c71e5ea28fbe8e72c148c755c9f3f8d9 let input = vec![ - pkg!{("-T-_-_A_CO--XgN_K2B4416_G--sys", "2.3.0")}, pkg!{("DKrq_-0Z9a3-Sgq-3uF_6-m--_", "3.0.3")}, - pkg!{("DKrq_-0Z9a3-Sgq-3uF_6-m--_", "3.3.0") => [ - dep_req("-T-_-_A_CO--XgN_K2B4416_G--sys", "=2.3.0"), - ] }, - pkg!{("DKrq_-0Z9a3-Sgq-3uF_6-m--_", "3.3.1") => [ - dep_req("-T-_-_A_CO--XgN_K2B4416_G--sys", "=2.3.0"), - ] }, + pkg!{("DKrq_-0Z9a3-Sgq-3uF_6-m--_", "3.3.0")}, + pkg!{("DKrq_-0Z9a3-Sgq-3uF_6-m--_", "3.3.1")}, pkg!{("GRF35jH--W_Yy-TWb--bA1beA_5", "3.3.0") => [ - dep_req("-T-_-_A_CO--XgN_K2B4416_G--sys", "=2.3.0"), dep_req("DKrq_-0Z9a3-Sgq-3uF_6-m--_", "=3.0.3"), ] }, pkg!{("GRF35jH--W_Yy-TWb--bA1beA_5", "3.3.2") => [ - dep_req("-T-_-_A_CO--XgN_K2B4416_G--sys", "=2.3.0"), dep_req("DKrq_-0Z9a3-Sgq-3uF_6-m--_", ">=3.0.3, <=3.3.0"), ] }, - pkg!{("QUW50-sys", "1.0.2") => [ - dep_req("-T-_-_A_CO--XgN_K2B4416_G--sys", "=2.3.0"), - dep_req("GRF35jH--W_Yy-TWb--bA1beA_5", "=3.3.2"), - ] }, - pkg!{("QUW50-sys", "1.2.0")}, - pkg!{("QUW50-sys", "1.3.1")}, pkg!{("S-y_ebdMD--O_yAi-X3-EePZaHE7LBWk-sys", "0.1.3") => [ - dep_req("-T-_-_A_CO--XgN_K2B4416_G--sys", "=2.3.0"), dep_req("GRF35jH--W_Yy-TWb--bA1beA_5", "=3.3.0"), - dep_req("QUW50-sys", "=1.3.1"), ] }, pkg!{("S-y_ebdMD--O_yAi-X3-EePZaHE7LBWk-sys", "2.0.2") => [ - dep_req("-T-_-_A_CO--XgN_K2B4416_G--sys", "=2.3.0"), dep_req("DKrq_-0Z9a3-Sgq-3uF_6-m--_", ">=3.3.0, <=3.3.1"), dep_req("GRF35jH--W_Yy-TWb--bA1beA_5", ">=3.3.0, <=3.3.2"), - dep_req("QUW50-sys", ">=1.0.2, <=1.3.1"), ] }, pkg!{("S-y_ebdMD--O_yAi-X3-EePZaHE7LBWk-sys", "2.3.3") => [ - dep_req("-T-_-_A_CO--XgN_K2B4416_G--sys", "=2.3.0"), dep_req("DKrq_-0Z9a3-Sgq-3uF_6-m--_", ">=3.3.0, <=3.3.1"), dep_req("GRF35jH--W_Yy-TWb--bA1beA_5", "=3.3.0"), - dep_req("QUW50-sys", ">=1.0.2, <=1.2.0"), ] }, pkg!{"z" => [ dep_req("S-y_ebdMD--O_yAi-X3-EePZaHE7LBWk-sys", ">=0.1.3, <=2.3.3"), -- 2.39.5