aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock23
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/tests/heavy_tests/support.rs4
3 files changed, 4 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 0d63ec639..150e6d1ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -766,7 +766,7 @@ dependencies = [
766 "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", 766 "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
767 "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", 767 "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
768 "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", 768 "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
769 "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 769 "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
770 "test_utils 0.1.0", 770 "test_utils 0.1.0",
771 "text_unit 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 771 "text_unit 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
772 "thread_worker 0.1.0", 772 "thread_worker 0.1.0",
@@ -816,16 +816,6 @@ dependencies = [
816 816
817[[package]] 817[[package]]
818name = "rand" 818name = "rand"
819version = "0.4.3"
820source = "registry+https://github.com/rust-lang/crates.io-index"
821dependencies = [
822 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
823 "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
824 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
825]
826
827[[package]]
828name = "rand"
829version = "0.5.5" 819version = "0.5.5"
830source = "registry+https://github.com/rust-lang/crates.io-index" 820source = "registry+https://github.com/rust-lang/crates.io-index"
831dependencies = [ 821dependencies = [
@@ -1189,15 +1179,6 @@ dependencies = [
1189] 1179]
1190 1180
1191[[package]] 1181[[package]]
1192name = "tempdir"
1193version = "0.3.7"
1194source = "registry+https://github.com/rust-lang/crates.io-index"
1195dependencies = [
1196 "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
1197 "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
1198]
1199
1200[[package]]
1201name = "tempfile" 1182name = "tempfile"
1202version = "3.0.5" 1183version = "3.0.5"
1203source = "registry+https://github.com/rust-lang/crates.io-index" 1184source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1585,7 +1566,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1585"checksum proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "926d0604475349f463fe44130aae73f2294b5309ab2ca0310b998bd334ef191f" 1566"checksum proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "926d0604475349f463fe44130aae73f2294b5309ab2ca0310b998bd334ef191f"
1586"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" 1567"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
1587"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" 1568"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
1588"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
1589"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" 1569"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
1590"checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a" 1570"checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a"
1591"checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a" 1571"checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a"
@@ -1629,7 +1609,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1629"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741" 1609"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
1630"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc" 1610"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
1631"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" 1611"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
1632"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
1633"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" 1612"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
1634"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3" 1613"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
1635"checksum teraron 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d89ad4617d1dec55331067fadaa041e813479e1779616f3d3ce9308bf46184e" 1614"checksum teraron 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d89ad4617d1dec55331067fadaa041e813479e1779616f3d3ce9308bf46184e"
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index b1e8987fe..22a26b844 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -35,6 +35,6 @@ gen_lsp_server = { path = "../gen_lsp_server" }
35ra_vfs = { path = "../ra_vfs" } 35ra_vfs = { path = "../ra_vfs" }
36 36
37[dev-dependencies] 37[dev-dependencies]
38tempdir = "0.3.7" 38tempfile = "3"
39test_utils = { path = "../test_utils" } 39test_utils = { path = "../test_utils" }
40tools = { path = "../tools" } 40tools = { path = "../tools" }
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs
index 82ba12f87..7db168b0f 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/support.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs
@@ -16,7 +16,7 @@ use languageserver_types::{
16}; 16};
17use serde::Serialize; 17use serde::Serialize;
18use serde_json::{to_string_pretty, Value}; 18use serde_json::{to_string_pretty, Value};
19use tempdir::TempDir; 19use tempfile::TempDir;
20use thread_worker::{WorkerHandle, Worker}; 20use thread_worker::{WorkerHandle, Worker};
21use test_utils::{parse_fixture, find_mismatch}; 21use test_utils::{parse_fixture, find_mismatch};
22 22
@@ -28,7 +28,7 @@ pub fn project(fixture: &str) -> Server {
28 static INIT: Once = Once::new(); 28 static INIT: Once = Once::new();
29 INIT.call_once(|| Logger::with_env_or_str(crate::LOG).start().unwrap()); 29 INIT.call_once(|| Logger::with_env_or_str(crate::LOG).start().unwrap());
30 30
31 let tmp_dir = TempDir::new("test-project").unwrap(); 31 let tmp_dir = TempDir::new().unwrap();
32 let mut paths = vec![]; 32 let mut paths = vec![];
33 33
34 for entry in parse_fixture(fixture) { 34 for entry in parse_fixture(fixture) {