diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-15 18:55:03 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-15 18:55:03 +0100 |
commit | e929355eca10b1d8d4e55ddd41549d5bf0a685aa (patch) | |
tree | 872ab3701dcd27207fab5531269a66d205c74539 /crates/ra_lsp_server/tests | |
parent | a230b438e025c5878b8d17e11d3928cbad95bb28 (diff) | |
parent | 9a98d8e99acf8acd40b2153847a37551d2a8d0f4 (diff) |
Merge #129
129: 2018 r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/tests')
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/main.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/support.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index dced45f55..7265b5999 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs | |||
@@ -12,7 +12,7 @@ mod support; | |||
12 | 12 | ||
13 | use ra_lsp_server::req::{Runnables, RunnablesParams}; | 13 | use ra_lsp_server::req::{Runnables, RunnablesParams}; |
14 | 14 | ||
15 | use support::project; | 15 | use crate::support::project; |
16 | 16 | ||
17 | 17 | ||
18 | const LOG: &'static str = ""; | 18 | const LOG: &'static str = ""; |
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs index 8fe2aa816..d1339f62f 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/support.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs | |||
@@ -25,7 +25,7 @@ use ra_lsp_server::{main_loop, req, thread_watcher::{ThreadWatcher, Worker}}; | |||
25 | 25 | ||
26 | pub fn project(fixture: &str) -> Server { | 26 | pub fn project(fixture: &str) -> Server { |
27 | static INIT: Once = Once::new(); | 27 | static INIT: Once = Once::new(); |
28 | INIT.call_once(|| Logger::with_env_or_str(::LOG).start().unwrap()); | 28 | INIT.call_once(|| Logger::with_env_or_str(crate::LOG).start().unwrap()); |
29 | 29 | ||
30 | let tmp_dir = TempDir::new("test-project") | 30 | let tmp_dir = TempDir::new("test-project") |
31 | .unwrap(); | 31 | .unwrap(); |