diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/main.rs | 2 | ||||
-rw-r--r-- | crates/tools/src/lib.rs | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index c53106a62..f8f91e5e7 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -33,6 +33,7 @@ ra_text_edit = { path = "../ra_text_edit" } | |||
33 | ra_analysis = { path = "../ra_analysis" } | 33 | ra_analysis = { path = "../ra_analysis" } |
34 | gen_lsp_server = { path = "../gen_lsp_server" } | 34 | gen_lsp_server = { path = "../gen_lsp_server" } |
35 | ra_vfs = { path = "../ra_vfs" } | 35 | ra_vfs = { path = "../ra_vfs" } |
36 | tools = { path = "../tools" } | ||
36 | 37 | ||
37 | [dev-dependencies] | 38 | [dev-dependencies] |
38 | tempdir = "0.3.7" | 39 | tempdir = "0.3.7" |
diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index e9f02a6e4..b0e1e65b6 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs | |||
@@ -121,6 +121,8 @@ fn test_eggs() {} | |||
121 | use std::collections::HashMap; | 121 | use std::collections::HashMap; |
122 | #[test] | 122 | #[test] |
123 | fn test_format_document() { | 123 | fn test_format_document() { |
124 | tools::install_rustfmt().unwrap(); | ||
125 | |||
124 | let server = project( | 126 | let server = project( |
125 | r#" | 127 | r#" |
126 | [package] | 128 | [package] |
diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs index 6f96b8120..e5b32c25c 100644 --- a/crates/tools/src/lib.rs +++ b/crates/tools/src/lib.rs | |||
@@ -117,7 +117,7 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> { | |||
117 | Ok(()) | 117 | Ok(()) |
118 | } | 118 | } |
119 | 119 | ||
120 | fn install_rustfmt() -> Result<()> { | 120 | pub fn install_rustfmt() -> Result<()> { |
121 | run(&format!("rustup install {}", TOOLCHAIN), ".")?; | 121 | run(&format!("rustup install {}", TOOLCHAIN), ".")?; |
122 | run( | 122 | run( |
123 | &format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN), | 123 | &format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN), |