aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-01-08 10:28:07 +0000
committerGitHub <[email protected]>2020-01-08 10:28:07 +0000
commitd5abe4cfddd5c6e14100f20d27d3de38fe7201f5 (patch)
tree26c4c71ada92de3ff7fe0a5864a42780ea276b20
parent8317efa19159092430c971c9f29e611e448951c3 (diff)
parentceb8f74901f3160cc6ab0de6b8a1eb0f1984e060 (diff)
Merge #2763
2763: :arrow_up: pico-args r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock8
-rw-r--r--xtask/src/main.rs4
2 files changed, 6 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 312240bd2..159b65d01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -800,7 +800,7 @@ dependencies = [
800 800
801[[package]] 801[[package]]
802name = "pico-args" 802name = "pico-args"
803version = "0.3.0" 803version = "0.3.1"
804source = "registry+https://github.com/rust-lang/crates.io-index" 804source = "registry+https://github.com/rust-lang/crates.io-index"
805 805
806[[package]] 806[[package]]
@@ -919,7 +919,7 @@ name = "ra_cli"
919version = "0.1.0" 919version = "0.1.0"
920dependencies = [ 920dependencies = [
921 "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 921 "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
922 "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 922 "pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
923 "ra_batch 0.1.0", 923 "ra_batch 0.1.0",
924 "ra_db 0.1.0", 924 "ra_db 0.1.0",
925 "ra_hir 0.1.0", 925 "ra_hir 0.1.0",
@@ -1751,7 +1751,7 @@ name = "xtask"
1751version = "0.1.0" 1751version = "0.1.0"
1752dependencies = [ 1752dependencies = [
1753 "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", 1753 "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
1754 "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 1754 "pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1755 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", 1755 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
1756 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1756 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
1757 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", 1757 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1863,7 +1863,7 @@ dependencies = [
1863"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" 1863"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5"
1864"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" 1864"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
1865"checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" 1865"checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
1866"checksum pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "22e32b0f3771287ebb436130477eabf0f11f934ed036099ad548bc885e708667" 1866"checksum pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc"
1867"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" 1867"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
1868"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" 1868"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
1869"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" 1869"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 053453e6e..c347de9ab 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -22,8 +22,8 @@ fn main() -> Result<()> {
22 return pre_commit::run_hook(); 22 return pre_commit::run_hook();
23 } 23 }
24 24
25 let subcommand = std::env::args().nth(1).unwrap_or_default(); 25 let mut args = Arguments::from_env();
26 let mut args = Arguments::from_vec(std::env::args_os().skip(2).collect()); 26 let subcommand = args.subcommand()?.unwrap_or_default();
27 27
28 match subcommand.as_str() { 28 match subcommand.as_str() {
29 "install" => { 29 "install" => {