Merge #490

490: dont depend on tools from lsp-server r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

4 files changed, 1 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index 86bce93d6..789adcbe3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ build: &rust_build
     language: rust
     rust: 1.31.1
     script:
+        - rustup component add rustfmt
         - cargo gen-tests --verify
         - cargo gen-syntax --verify
         - cargo test --no-run  # let's measure compile time separately
diff --git a/Cargo.lock b/Cargo.lock
index 45f1feb7e..877ef9410 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -749,7 +749,6 @@ dependencies = [
  "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_worker 0.1.0",
  "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tools 0.1.0",
  "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index b4a7b3388..a0819978b 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -37,4 +37,3 @@ ra_vfs = { path = "../ra_vfs" }
 [dev-dependencies]
 tempfile = "3"
 test_utils = { path = "../test_utils" }
-tools = { path = "../tools" }
diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs
index 4cae44eab..9eaf46ac8 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/main.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs
@@ -125,8 +125,6 @@ fn test_eggs() {}
 use std::collections::HashMap;
 #[test]
 fn test_format_document() {
-    tools::install_rustfmt().unwrap();
-
     let server = project(
         r#"
 [package]