diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-30 20:33:32 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-30 20:33:32 +0000 |
commit | f9b58454a43274d3b1d4d0e74cdef597b75f9a97 (patch) | |
tree | d55ebf4bf4753fb4becefa134b7a9a18c0bb241f /crates | |
parent | 45e3de8eed878afa1066b61fa27f7625bf57b1e6 (diff) | |
parent | f0edb93df2e282146e86174a5b129039cc6fce0a (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.toml | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/support.rs | 4 |
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" } | |||
35 | ra_vfs = { path = "../ra_vfs" } | 35 | ra_vfs = { path = "../ra_vfs" } |
36 | 36 | ||
37 | [dev-dependencies] | 37 | [dev-dependencies] |
38 | tempdir = "0.3.7" | 38 | tempfile = "3" |
39 | test_utils = { path = "../test_utils" } | 39 | test_utils = { path = "../test_utils" } |
40 | tools = { path = "../tools" } | 40 | tools = { 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 | }; |
17 | use serde::Serialize; | 17 | use serde::Serialize; |
18 | use serde_json::{to_string_pretty, Value}; | 18 | use serde_json::{to_string_pretty, Value}; |
19 | use tempdir::TempDir; | 19 | use tempfile::TempDir; |
20 | use thread_worker::{WorkerHandle, Worker}; | 20 | use thread_worker::{WorkerHandle, Worker}; |
21 | use test_utils::{parse_fixture, find_mismatch}; | 21 | use 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) { |