aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock24
-rw-r--r--crates/ra_cli/Cargo.toml2
-rw-r--r--crates/ra_cli/src/main.rs8
-rw-r--r--crates/ra_tools/Cargo.toml2
4 files changed, 18 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock
index fbf96920d..988f7ec0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -305,7 +305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
305 305
306[[package]] 306[[package]]
307name = "either" 307name = "either"
308version = "1.5.2" 308version = "1.5.3"
309source = "registry+https://github.com/rust-lang/crates.io-index" 309source = "registry+https://github.com/rust-lang/crates.io-index"
310 310
311[[package]] 311[[package]]
@@ -339,7 +339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
339 339
340[[package]] 340[[package]]
341name = "flexi_logger" 341name = "flexi_logger"
342version = "0.14.3" 342version = "0.14.4"
343source = "registry+https://github.com/rust-lang/crates.io-index" 343source = "registry+https://github.com/rust-lang/crates.io-index"
344dependencies = [ 344dependencies = [
345 "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", 345 "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -516,7 +516,7 @@ name = "itertools"
516version = "0.8.0" 516version = "0.8.0"
517source = "registry+https://github.com/rust-lang/crates.io-index" 517source = "registry+https://github.com/rust-lang/crates.io-index"
518dependencies = [ 518dependencies = [
519 "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", 519 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
520] 520]
521 521
522[[package]] 522[[package]]
@@ -829,7 +829,7 @@ dependencies = [
829 829
830[[package]] 830[[package]]
831name = "pico-args" 831name = "pico-args"
832version = "0.2.0" 832version = "0.3.0"
833source = "registry+https://github.com/rust-lang/crates.io-index" 833source = "registry+https://github.com/rust-lang/crates.io-index"
834 834
835[[package]] 835[[package]]
@@ -926,9 +926,9 @@ dependencies = [
926name = "ra_cli" 926name = "ra_cli"
927version = "0.1.0" 927version = "0.1.0"
928dependencies = [ 928dependencies = [
929 "flexi_logger 0.14.3 (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",
@@ -1013,7 +1013,7 @@ name = "ra_lsp_server"
1013version = "0.1.0" 1013version = "0.1.0"
1014dependencies = [ 1014dependencies = [
1015 "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", 1015 "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
1016 "flexi_logger 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", 1016 "flexi_logger 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)",
1017 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1017 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1018 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", 1018 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
1019 "lsp-server 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1019 "lsp-server 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1112,7 +1112,7 @@ name = "ra_tools"
1112version = "0.1.0" 1112version = "0.1.0"
1113dependencies = [ 1113dependencies = [
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)",
@@ -1299,7 +1299,7 @@ version = "1.2.0"
1299source = "registry+https://github.com/rust-lang/crates.io-index" 1299source = "registry+https://github.com/rust-lang/crates.io-index"
1300dependencies = [ 1300dependencies = [
1301 "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1301 "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
1302 "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", 1302 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
1303 "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", 1303 "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
1304] 1304]
1305 1305
@@ -1800,12 +1800,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1800"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" 1800"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
1801"checksum drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f" 1801"checksum drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f"
1802"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" 1802"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
1803"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" 1803"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
1804"checksum ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc01d68e08ca384955a3aeba9217102ca1aa85b6e168639bf27739f1d749d87" 1804"checksum ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc01d68e08ca384955a3aeba9217102ca1aa85b6e168639bf27739f1d749d87"
1805"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" 1805"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
1806"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469" 1806"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469"
1807"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" 1807"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
1808"checksum flexi_logger 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66473c1b6a0d2a72f6ed983d33021a4c744a1d179e6f4265867b7d0a9dd679c5" 1808"checksum flexi_logger 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d20d127f22dd09495f5a5de83dc9f51cf90932735b642910062c577082dd3b36"
1809"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" 1809"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
1810"checksum format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7aea5a5909a74969507051a3b17adc84737e31a5f910559892aedce026f4d53" 1810"checksum format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7aea5a5909a74969507051a3b17adc84737e31a5f910559892aedce026f4d53"
1811"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" 1811"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
@@ -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"]
6publish = false 6publish = false
7 7
8[dependencies] 8[dependencies]
9pico-args = "0.2.0" 9pico-args = "0.3.0"
10flexi_logger = "0.14.0" 10flexi_logger = "0.14.0"
11indicatif = "0.11.0" 11indicatif = "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]
9walkdir = "2.1.3" 9walkdir = "2.1.3"
10itertools = "0.8.0" 10itertools = "0.8.0"
11pico-args = "0.2.0" 11pico-args = "0.3.0"
12quote = "1.0.2" 12quote = "1.0.2"
13proc-macro2 = "1.0.1" 13proc-macro2 = "1.0.1"
14ron = "0.5.1" 14ron = "0.5.1"