aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--Cargo.lock1
-rw-r--r--crates/ra_lsp_server/Cargo.toml1
-rw-r--r--crates/ra_lsp_server/src/main_loop.rs1
-rw-r--r--crates/tools/src/lib.rs2
5 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 12e4da4a3..7ccfe78fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ before_cache:
6 6
7build: &rust_build 7build: &rust_build
8 language: rust 8 language: rust
9 rust: 1.31.1 9 rust: 1.32.0
10 script: 10 script:
11 - rustup component add rustfmt 11 - rustup component add rustfmt
12 - rustup component add rust-src 12 - rustup component add rust-src
diff --git a/Cargo.lock b/Cargo.lock
index e0a41e258..490299b4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -785,7 +785,6 @@ dependencies = [
785 "ra_syntax 0.1.0", 785 "ra_syntax 0.1.0",
786 "ra_text_edit 0.1.0", 786 "ra_text_edit 0.1.0",
787 "ra_vfs 0.1.0", 787 "ra_vfs 0.1.0",
788 "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
789 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 788 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
790 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 789 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
791 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", 790 "serde 1.0.84 (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 e87d311eb..dd8543c56 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -5,7 +5,6 @@ version = "0.1.0"
5authors = ["Aleksey Kladov <[email protected]>"] 5authors = ["Aleksey Kladov <[email protected]>"]
6 6
7[dependencies] 7[dependencies]
8rayon = "1.0.2"
9threadpool = "1.7.1" 8threadpool = "1.7.1"
10relative-path = "0.4.0" 9relative-path = "0.4.0"
11failure = "0.1.4" 10failure = "0.1.4"
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 19fd294e0..c48c4dd9e 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -12,7 +12,6 @@ use gen_lsp_server::{
12use lsp_types::NumberOrString; 12use lsp_types::NumberOrString;
13use ra_ide_api::{Canceled, FileId, LibraryData}; 13use ra_ide_api::{Canceled, FileId, LibraryData};
14use ra_vfs::VfsTask; 14use ra_vfs::VfsTask;
15use rayon;
16use rustc_hash::FxHashSet; 15use rustc_hash::FxHashSet;
17use serde::{de::DeserializeOwned, Serialize}; 16use serde::{de::DeserializeOwned, Serialize};
18use threadpool::ThreadPool; 17use threadpool::ThreadPool;
diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs
index fa619af33..39f181432 100644
--- a/crates/tools/src/lib.rs
+++ b/crates/tools/src/lib.rs
@@ -15,7 +15,7 @@ pub type Result<T> = std::result::Result<T, failure::Error>;
15pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; 15pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron";
16pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; 16pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera";
17pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera"; 17pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera";
18const TOOLCHAIN: &str = "1.31.1"; 18const TOOLCHAIN: &str = "1.32.0";
19 19
20#[derive(Debug)] 20#[derive(Debug)]
21pub struct Test { 21pub struct Test {