aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rw-r--r--Cargo.lock1
-rw-r--r--crates/ra_lsp_server/Cargo.toml1
-rw-r--r--crates/ra_lsp_server/tests/heavy_tests/main.rs2
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
8 language: rust 8 language: rust
9 rust: 1.31.1 9 rust: 1.31.1
10 script: 10 script:
11 - rustup component add rustfmt
11 - cargo gen-tests --verify 12 - cargo gen-tests --verify
12 - cargo gen-syntax --verify 13 - cargo gen-syntax --verify
13 - cargo test --no-run # let's measure compile time separately 14 - 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 = [
749 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 749 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
750 "thread_worker 0.1.0", 750 "thread_worker 0.1.0",
751 "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 751 "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
752 "tools 0.1.0",
753 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 752 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
754 "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", 753 "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
755] 754]
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" }
37[dev-dependencies] 37[dev-dependencies]
38tempfile = "3" 38tempfile = "3"
39test_utils = { path = "../test_utils" } 39test_utils = { path = "../test_utils" }
40tools = { 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() {}
125use std::collections::HashMap; 125use std::collections::HashMap;
126#[test] 126#[test]
127fn test_format_document() { 127fn test_format_document() {
128 tools::install_rustfmt().unwrap();
129
130 let server = project( 128 let server = project(
131 r#" 129 r#"
132[package] 130[package]