From: bors <bors@rust-lang.org>
Date: Tue, 13 Mar 2018 14:46:45 +0000 (+0000)
Subject: Auto merge of #5152 - matklad:clap, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~47
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3cfb23bc563ec8021537ba533c49a451516d776d;p=cargo.git

Auto merge of #5152 - matklad:clap, r=alexcrichton

Clap

Reopening of #5129

So, looks like all tests are :green_apple: on my machine!

I definitely want to refactor it some more, and also manually checked that we haven't regressed any help messages, but all the major parts are in place already.
---

3cfb23bc563ec8021537ba533c49a451516d776d
diff --cc src/cargo/ops/cargo_run.rs
index f4c6c71ad,cfd26e752..1858dab78
--- a/src/cargo/ops/cargo_run.rs
+++ b/src/cargo/ops/cargo_run.rs
@@@ -13,10 -13,10 +13,10 @@@ pub fn run(ws: &Workspace
          Packages::All |
          Packages::Default |
          Packages::OptOut(_) => unreachable!("cargo run supports single package only"),
-         Packages::Packages(xs) => match xs.len() {
+         Packages::Packages(ref xs) => match xs.len() {
              0 => ws.current()?,
              1 => ws.members()
 -                .find(|pkg| pkg.name() == xs[0])
 +                .find(|pkg| &*pkg.name() == xs[0])
                  .ok_or_else(||
                      format_err!("package `{}` is not a member of the workspace", xs[0])
                  )?,