diff --git a/.travis.yml b/.travis.yml index 12e4da4a30fc..7ccfe78fb9ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_cache: build: &rust_build language: rust - rust: 1.31.1 + rust: 1.32.0 script: - rustup component add rustfmt - rustup component add rust-src diff --git a/Cargo.lock b/Cargo.lock index e0a41e2580c3..490299b4b0ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -785,7 +785,6 @@ dependencies = [ "ra_syntax 0.1.0", "ra_text_edit 0.1.0", "ra_vfs 0.1.0", - "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "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 e87d311ebb37..dd8543c561e8 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml @@ -5,7 +5,6 @@ version = "0.1.0" authors = ["Aleksey Kladov "] [dependencies] -rayon = "1.0.2" threadpool = "1.7.1" relative-path = "0.4.0" failure = "0.1.4" diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 19fd294e0b7f..c48c4dd9edcf 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::{ use lsp_types::NumberOrString; use ra_ide_api::{Canceled, FileId, LibraryData}; use ra_vfs::VfsTask; -use rayon; use rustc_hash::FxHashSet; use serde::{de::DeserializeOwned, Serialize}; use threadpool::ThreadPool; diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs index fa619af333bf..39f181432406 100644 --- a/crates/tools/src/lib.rs +++ b/crates/tools/src/lib.rs @@ -15,7 +15,7 @@ pub type Result = std::result::Result; pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera"; -const TOOLCHAIN: &str = "1.31.1"; +const TOOLCHAIN: &str = "1.32.0"; #[derive(Debug)] pub struct Test {