diff options
author | kjeremy <[email protected]> | 2019-10-02 15:58:15 +0100 |
---|---|---|
committer | kjeremy <[email protected]> | 2019-10-02 15:58:15 +0100 |
commit | b4e69397600be57795930fbd37c0948ba9688098 (patch) | |
tree | e408f9e277d31e4961e7ab41acc8ec1b703b5327 | |
parent | 79979db944fd662b7d4b495850c08ef715cd6169 (diff) |
Update pico-args
-rw-r--r-- | Cargo.lock | 8 | ||||
-rw-r--r-- | crates/ra_cli/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_cli/src/main.rs | 8 | ||||
-rw-r--r-- | crates/ra_tools/Cargo.toml | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index ada5e7bc2..988f7ec0b 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -829,7 +829,7 @@ dependencies = [ | |||
829 | 829 | ||
830 | [[package]] | 830 | [[package]] |
831 | name = "pico-args" | 831 | name = "pico-args" |
832 | version = "0.2.0" | 832 | version = "0.3.0" |
833 | source = "registry+https://github.com/rust-lang/crates.io-index" | 833 | source = "registry+https://github.com/rust-lang/crates.io-index" |
834 | 834 | ||
835 | [[package]] | 835 | [[package]] |
@@ -928,7 +928,7 @@ version = "0.1.0" | |||
928 | dependencies = [ | 928 | dependencies = [ |
929 | "flexi_logger 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", | 929 | "flexi_logger 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", |
930 | "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", | 930 | "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", |
931 | "pico-args 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 931 | "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", |
932 | "ra_batch 0.1.0", | 932 | "ra_batch 0.1.0", |
933 | "ra_db 0.1.0", | 933 | "ra_db 0.1.0", |
934 | "ra_hir 0.1.0", | 934 | "ra_hir 0.1.0", |
@@ -1112,7 +1112,7 @@ name = "ra_tools" | |||
1112 | version = "0.1.0" | 1112 | version = "0.1.0" |
1113 | dependencies = [ | 1113 | dependencies = [ |
1114 | "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1114 | "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1115 | "pico-args 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1115 | "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1116 | "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 1116 | "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", |
1117 | "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", | 1117 | "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", |
1118 | "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1118 | "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1864,7 +1864,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1864 | "checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" | 1864 | "checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" |
1865 | "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" | 1865 | "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" |
1866 | "checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" | 1866 | "checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" |
1867 | "checksum pico-args 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2fce25154205cf4360b456fd7d48994afe20663b77e3bd3d0a353a2fccf7f22c" | 1867 | "checksum pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "22e32b0f3771287ebb436130477eabf0f11f934ed036099ad548bc885e708667" |
1868 | "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" | 1868 | "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" |
1869 | "checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8" | 1869 | "checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8" |
1870 | "checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc" | 1870 | "checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc" |
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml index d42ac3ad4..67e727a88 100644 --- a/crates/ra_cli/Cargo.toml +++ b/crates/ra_cli/Cargo.toml | |||
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"] | |||
6 | publish = false | 6 | publish = false |
7 | 7 | ||
8 | [dependencies] | 8 | [dependencies] |
9 | pico-args = "0.2.0" | 9 | pico-args = "0.3.0" |
10 | flexi_logger = "0.14.0" | 10 | flexi_logger = "0.14.0" |
11 | indicatif = "0.11.0" | 11 | indicatif = "0.11.0" |
12 | 12 | ||
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs index e6c76087e..2405eb4f4 100644 --- a/crates/ra_cli/src/main.rs +++ b/crates/ra_cli/src/main.rs | |||
@@ -95,7 +95,7 @@ fn main() -> Result<()> { | |||
95 | (true, true) => Err("Invalid flags: -q conflicts with -v")?, | 95 | (true, true) => Err("Invalid flags: -q conflicts with -v")?, |
96 | }; | 96 | }; |
97 | let memory_usage = matches.contains("--memory-usage"); | 97 | let memory_usage = matches.contains("--memory-usage"); |
98 | let only: Option<String> = matches.value_from_str(["-o", "--only"])?; | 98 | let only: Option<String> = matches.opt_value_from_str(["-o", "--only"])?; |
99 | let path = { | 99 | let path = { |
100 | let mut trailing = matches.free()?; | 100 | let mut trailing = matches.free()?; |
101 | if trailing.len() != 1 { | 101 | if trailing.len() != 1 { |
@@ -117,9 +117,9 @@ fn main() -> Result<()> { | |||
117 | return Ok(()); | 117 | return Ok(()); |
118 | } | 118 | } |
119 | let verbose = matches.contains(["-v", "--verbose"]); | 119 | let verbose = matches.contains(["-v", "--verbose"]); |
120 | let path: String = matches.value_from_str("--path")?.unwrap_or_default(); | 120 | let path: String = matches.opt_value_from_str("--path")?.unwrap_or_default(); |
121 | let highlight_path = matches.value_from_str("--highlight")?; | 121 | let highlight_path = matches.opt_value_from_str("--highlight")?; |
122 | let complete_path = matches.value_from_str("--complete")?; | 122 | let complete_path = matches.opt_value_from_str("--complete")?; |
123 | if highlight_path.is_some() && complete_path.is_some() { | 123 | if highlight_path.is_some() && complete_path.is_some() { |
124 | panic!("either --highlight or --complete must be set, not both") | 124 | panic!("either --highlight or --complete must be set, not both") |
125 | } | 125 | } |
diff --git a/crates/ra_tools/Cargo.toml b/crates/ra_tools/Cargo.toml index 848ca408d..9cceacee3 100644 --- a/crates/ra_tools/Cargo.toml +++ b/crates/ra_tools/Cargo.toml | |||
@@ -8,7 +8,7 @@ publish = false | |||
8 | [dependencies] | 8 | [dependencies] |
9 | walkdir = "2.1.3" | 9 | walkdir = "2.1.3" |
10 | itertools = "0.8.0" | 10 | itertools = "0.8.0" |
11 | pico-args = "0.2.0" | 11 | pico-args = "0.3.0" |
12 | quote = "1.0.2" | 12 | quote = "1.0.2" |
13 | proc-macro2 = "1.0.1" | 13 | proc-macro2 = "1.0.1" |
14 | ron = "0.5.1" | 14 | ron = "0.5.1" |