aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock87
-rw-r--r--crates/ra_env/Cargo.toml2
-rw-r--r--crates/ra_env/src/lib.rs2
3 files changed, 13 insertions, 78 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 28424b7d4..000c26c4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,12 +22,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
22checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" 22checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
23 23
24[[package]] 24[[package]]
25name = "arrayref"
26version = "0.3.6"
27source = "registry+https://github.com/rust-lang/crates.io-index"
28checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
29
30[[package]]
31name = "arrayvec" 25name = "arrayvec"
32version = "0.5.1" 26version = "0.5.1"
33source = "registry+https://github.com/rust-lang/crates.io-index" 27source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -74,12 +68,6 @@ dependencies = [
74 68
75[[package]] 69[[package]]
76name = "base64" 70name = "base64"
77version = "0.11.0"
78source = "registry+https://github.com/rust-lang/crates.io-index"
79checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
80
81[[package]]
82name = "base64"
83version = "0.12.0" 71version = "0.12.0"
84source = "registry+https://github.com/rust-lang/crates.io-index" 72source = "registry+https://github.com/rust-lang/crates.io-index"
85checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" 73checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3"
@@ -91,17 +79,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
91checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" 79checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
92 80
93[[package]] 81[[package]]
94name = "blake2b_simd"
95version = "0.5.10"
96source = "registry+https://github.com/rust-lang/crates.io-index"
97checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
98dependencies = [
99 "arrayref",
100 "arrayvec",
101 "constant_time_eq",
102]
103
104[[package]]
105name = "bstr" 82name = "bstr"
106version = "0.2.12" 83version = "0.2.12"
107source = "registry+https://github.com/rust-lang/crates.io-index" 84source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -236,12 +213,6 @@ dependencies = [
236] 213]
237 214
238[[package]] 215[[package]]
239name = "constant_time_eq"
240version = "0.1.5"
241source = "registry+https://github.com/rust-lang/crates.io-index"
242checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
243
244[[package]]
245name = "crossbeam" 216name = "crossbeam"
246version = "0.7.3" 217version = "0.7.3"
247source = "registry+https://github.com/rust-lang/crates.io-index" 218source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -319,28 +290,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
319checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" 290checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
320 291
321[[package]] 292[[package]]
322name = "dirs"
323version = "2.0.2"
324source = "registry+https://github.com/rust-lang/crates.io-index"
325checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
326dependencies = [
327 "cfg-if",
328 "dirs-sys",
329]
330
331[[package]]
332name = "dirs-sys"
333version = "0.3.4"
334source = "registry+https://github.com/rust-lang/crates.io-index"
335checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
336dependencies = [
337 "cfg-if",
338 "libc",
339 "redox_users",
340 "winapi 0.3.8",
341]
342
343[[package]]
344name = "drop_bomb" 293name = "drop_bomb"
345version = "0.1.4" 294version = "0.1.4"
346source = "registry+https://github.com/rust-lang/crates.io-index" 295source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -516,6 +465,15 @@ dependencies = [
516] 465]
517 466
518[[package]] 467[[package]]
468name = "home"
469version = "0.5.3"
470source = "registry+https://github.com/rust-lang/crates.io-index"
471checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
472dependencies = [
473 "winapi 0.3.8",
474]
475
476[[package]]
519name = "idna" 477name = "idna"
520version = "0.2.0" 478version = "0.2.0"
521source = "registry+https://github.com/rust-lang/crates.io-index" 479source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -710,7 +668,7 @@ version = "0.74.1"
710source = "registry+https://github.com/rust-lang/crates.io-index" 668source = "registry+https://github.com/rust-lang/crates.io-index"
711checksum = "57c0e6a2b8837d27b29deb3f3e6dc1c6d2f57947677f9be1024e482ec5b59525" 669checksum = "57c0e6a2b8837d27b29deb3f3e6dc1c6d2f57947677f9be1024e482ec5b59525"
712dependencies = [ 670dependencies = [
713 "base64 0.12.0", 671 "base64",
714 "bitflags", 672 "bitflags",
715 "serde", 673 "serde",
716 "serde_json", 674 "serde_json",
@@ -1004,7 +962,7 @@ name = "ra_env"
1004version = "0.1.0" 962version = "0.1.0"
1005dependencies = [ 963dependencies = [
1006 "anyhow", 964 "anyhow",
1007 "dirs", 965 "home",
1008] 966]
1009 967
1010[[package]] 968[[package]]
@@ -1360,17 +1318,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1360checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" 1318checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
1361 1319
1362[[package]] 1320[[package]]
1363name = "redox_users"
1364version = "0.3.4"
1365source = "registry+https://github.com/rust-lang/crates.io-index"
1366checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
1367dependencies = [
1368 "getrandom",
1369 "redox_syscall",
1370 "rust-argon2",
1371]
1372
1373[[package]]
1374name = "regex" 1321name = "regex"
1375version = "1.3.7" 1322version = "1.3.7"
1376source = "registry+https://github.com/rust-lang/crates.io-index" 1323source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1455,18 +1402,6 @@ dependencies = [
1455] 1402]
1456 1403
1457[[package]] 1404[[package]]
1458name = "rust-argon2"
1459version = "0.7.0"
1460source = "registry+https://github.com/rust-lang/crates.io-index"
1461checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
1462dependencies = [
1463 "base64 0.11.0",
1464 "blake2b_simd",
1465 "constant_time_eq",
1466 "crossbeam-utils",
1467]
1468
1469[[package]]
1470name = "rustc-ap-rustc_lexer" 1405name = "rustc-ap-rustc_lexer"
1471version = "656.0.0" 1406version = "656.0.0"
1472source = "registry+https://github.com/rust-lang/crates.io-index" 1407source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/crates/ra_env/Cargo.toml b/crates/ra_env/Cargo.toml
index 7fed446a7..f0a401be5 100644
--- a/crates/ra_env/Cargo.toml
+++ b/crates/ra_env/Cargo.toml
@@ -6,4 +6,4 @@ authors = ["rust-analyzer developers"]
6 6
7[dependencies] 7[dependencies]
8anyhow = "1.0.26" 8anyhow = "1.0.26"
9dirs = "2.0" 9home = "0.5.3"
diff --git a/crates/ra_env/src/lib.rs b/crates/ra_env/src/lib.rs
index 4f94bffde..413da1982 100644
--- a/crates/ra_env/src/lib.rs
+++ b/crates/ra_env/src/lib.rs
@@ -36,7 +36,7 @@ pub fn get_path_for_executable(executable_name: impl AsRef<str>) -> Result<PathB
36 if is_valid_executable(executable_name) { 36 if is_valid_executable(executable_name) {
37 return Ok(executable_name.into()); 37 return Ok(executable_name.into());
38 } 38 }
39 if let Some(mut path) = dirs::home_dir() { 39 if let Some(mut path) = ::home::home_dir() {
40 path.push(".cargo"); 40 path.push(".cargo");
41 path.push("bin"); 41 path.push("bin");
42 path.push(executable_name); 42 path.push(executable_name);