aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-12-30 20:33:32 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-12-30 20:33:32 +0000
commitf9b58454a43274d3b1d4d0e74cdef597b75f9a97 (patch)
treed55ebf4bf4753fb4becefa134b7a9a18c0bb241f /crates
parent45e3de8eed878afa1066b61fa27f7625bf57b1e6 (diff)
parentf0edb93df2e282146e86174a5b129039cc6fce0a (diff)
Merge #378
378: migrate-to-tempdir r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/tests/heavy_tests/support.rs4
2 files changed, 3 insertions, 3 deletions
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) {