From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 8 Mar 2018 19:28:58 +0000 (+0300)
Subject: Support built-in aliases
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~47^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=35365a6f39de9baa8d46aada2be9079ca9bbf337;p=cargo.git

Support built-in aliases
---

diff --git a/src/bin/cli/build.rs b/src/bin/cli/build.rs
index 9587cb08d..99c66ae85 100644
--- a/src/bin/cli/build.rs
+++ b/src/bin/cli/build.rs
@@ -1,7 +1,7 @@
 use super::utils::*;
 
 pub fn cli() -> App {
-    subcommand("build")
+    subcommand("build").alias("b")
         .about("Compile a local package and all of its dependencies")
         .arg_package(
             "Package to build",
diff --git a/src/bin/cli/run.rs b/src/bin/cli/run.rs
index 8b2bee2bd..f9145b33e 100644
--- a/src/bin/cli/run.rs
+++ b/src/bin/cli/run.rs
@@ -3,7 +3,7 @@ use clap::AppSettings;
 use super::utils::*;
 
 pub fn cli() -> App {
-    subcommand("run")
+    subcommand("run").alias("r")
         .setting(AppSettings::TrailingVarArg)
         .about("Run the main binary of the local package (src/main.rs)")
         .arg(Arg::with_name("args").multiple(true))
diff --git a/src/bin/cli/test.rs b/src/bin/cli/test.rs
index 89cc7c98c..7a6dd3a6a 100644
--- a/src/bin/cli/test.rs
+++ b/src/bin/cli/test.rs
@@ -2,7 +2,7 @@ use super::utils::*;
 use clap::AppSettings;
 
 pub fn cli() -> App {
-    subcommand("test")
+    subcommand("test").alias("t")
         .setting(AppSettings::TrailingVarArg)
         .about("Execute all unit and integration tests of a local package")
         .arg(
diff --git a/tests/testsuite/cargo_alias_config.rs b/tests/testsuite/cargo_alias_config.rs
index 12f3c47a9..7eac7c63c 100644
--- a/tests/testsuite/cargo_alias_config.rs
+++ b/tests/testsuite/cargo_alias_config.rs
@@ -24,7 +24,6 @@ expected a list, but found a integer for [..]"));
 
 
 #[test]
-#[ignore]
 fn alias_default_config_overrides_config() {
     let p = project("foo")
         .file("Cargo.toml", &basic_bin_manifest("foo"))