diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-16 14:44:24 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-16 14:44:24 +0100 |
commit | 1216878f7be20dd0e652fb8cdc395009fdcfae07 (patch) | |
tree | 6551967cc8c6e921b66071453ad7888a9121d326 /crates/ra_lsp_server/tests/heavy_tests/main.rs | |
parent | 39cb6c6d3f78b193f5873c3492e530bbd24d5dd2 (diff) | |
parent | 61f3a438d3a729a6be941bca1ff4c6a97a33f221 (diff) |
Merge #134
134: Cargo Format run r=kjeremy a=kjeremy
I'm not sure how appreciated this is but I figured I would run `cargo fmt` and see what came up.
I made sure that `cargo test` still passes.
Co-authored-by: Jeremy A. Kolb <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/tests/heavy_tests/main.rs')
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/main.rs | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index 7265b5999..8e566d3c8 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs | |||
@@ -1,12 +1,12 @@ | |||
1 | #[macro_use] | 1 | #[macro_use] |
2 | extern crate crossbeam_channel; | 2 | extern crate crossbeam_channel; |
3 | extern crate tempdir; | 3 | extern crate flexi_logger; |
4 | extern crate gen_lsp_server; | ||
4 | extern crate languageserver_types; | 5 | extern crate languageserver_types; |
6 | extern crate ra_lsp_server; | ||
5 | extern crate serde; | 7 | extern crate serde; |
6 | extern crate serde_json; | 8 | extern crate serde_json; |
7 | extern crate gen_lsp_server; | 9 | extern crate tempdir; |
8 | extern crate flexi_logger; | ||
9 | extern crate ra_lsp_server; | ||
10 | 10 | ||
11 | mod support; | 11 | mod support; |
12 | 12 | ||
@@ -14,17 +14,18 @@ use ra_lsp_server::req::{Runnables, RunnablesParams}; | |||
14 | 14 | ||
15 | use crate::support::project; | 15 | use crate::support::project; |
16 | 16 | ||
17 | |||
18 | const LOG: &'static str = ""; | 17 | const LOG: &'static str = ""; |
19 | 18 | ||
20 | #[test] | 19 | #[test] |
21 | fn test_runnables_no_project() { | 20 | fn test_runnables_no_project() { |
22 | let server = project(r" | 21 | let server = project( |
22 | r" | ||
23 | //- lib.rs | 23 | //- lib.rs |
24 | #[test] | 24 | #[test] |
25 | fn foo() { | 25 | fn foo() { |
26 | } | 26 | } |
27 | "); | 27 | ", |
28 | ); | ||
28 | server.request::<Runnables>( | 29 | server.request::<Runnables>( |
29 | RunnablesParams { | 30 | RunnablesParams { |
30 | text_document: server.doc_id("lib.rs"), | 31 | text_document: server.doc_id("lib.rs"), |
@@ -41,13 +42,14 @@ fn foo() { | |||
41 | "start": { "character": 0, "line": 0 } | 42 | "start": { "character": 0, "line": 0 } |
42 | } | 43 | } |
43 | } | 44 | } |
44 | ]"# | 45 | ]"#, |
45 | ); | 46 | ); |
46 | } | 47 | } |
47 | 48 | ||
48 | #[test] | 49 | #[test] |
49 | fn test_runnables_project() { | 50 | fn test_runnables_project() { |
50 | let server = project(r#" | 51 | let server = project( |
52 | r#" | ||
51 | //- Cargo.toml | 53 | //- Cargo.toml |
52 | [package] | 54 | [package] |
53 | name = "foo" | 55 | name = "foo" |
@@ -59,7 +61,8 @@ pub fn foo() {} | |||
59 | //- tests/spam.rs | 61 | //- tests/spam.rs |
60 | #[test] | 62 | #[test] |
61 | fn test_eggs() {} | 63 | fn test_eggs() {} |
62 | "#); | 64 | "#, |
65 | ); | ||
63 | server.wait_for_feedback("workspace loaded"); | 66 | server.wait_for_feedback("workspace loaded"); |
64 | server.request::<Runnables>( | 67 | server.request::<Runnables>( |
65 | RunnablesParams { | 68 | RunnablesParams { |