diff options
-rw-r--r-- | Cargo.lock | 2 | ||||
-rw-r--r-- | crates/gen_lsp_server/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/gen_lsp_server/src/msg.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/req.rs | 2 |
6 files changed, 4 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index bf2297e69..1e5f00de0 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -334,7 +334,6 @@ dependencies = [ | |||
334 | "languageserver-types 0.53.0 (registry+https://github.com/rust-lang/crates.io-index)", | 334 | "languageserver-types 0.53.0 (registry+https://github.com/rust-lang/crates.io-index)", |
335 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 335 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
336 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 336 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", |
337 | "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | ||
338 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", | 337 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", |
339 | ] | 338 | ] |
340 | 339 | ||
@@ -732,7 +731,6 @@ dependencies = [ | |||
732 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 731 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
733 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 732 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
734 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | 733 | "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", |
735 | "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", | ||
736 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", | 734 | "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", |
737 | "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", | 735 | "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", |
738 | "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", | 736 | "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", |
diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml index 6c91e38aa..5f90d39d6 100644 --- a/crates/gen_lsp_server/Cargo.toml +++ b/crates/gen_lsp_server/Cargo.toml | |||
@@ -13,5 +13,4 @@ log = "0.4.3" | |||
13 | failure = "0.1.2" | 13 | failure = "0.1.2" |
14 | serde_json = "1.0.24" | 14 | serde_json = "1.0.24" |
15 | serde = "1.0.71" | 15 | serde = "1.0.71" |
16 | serde_derive = "1.0.71" | ||
17 | crossbeam-channel = "0.2.4" | 16 | crossbeam-channel = "0.2.4" |
diff --git a/crates/gen_lsp_server/src/msg.rs b/crates/gen_lsp_server/src/msg.rs index 22d273d55..ef6358cb1 100644 --- a/crates/gen_lsp_server/src/msg.rs +++ b/crates/gen_lsp_server/src/msg.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | use std::io::{BufRead, Write}; | 1 | use std::io::{BufRead, Write}; |
2 | 2 | ||
3 | use languageserver_types::{notification::Notification, request::Request}; | 3 | use languageserver_types::{notification::Notification, request::Request}; |
4 | use serde_derive::{Deserialize, Serialize}; | 4 | use serde::{Deserialize, Serialize}; |
5 | use serde_json::{from_str, from_value, to_string, to_value, Value}; | 5 | use serde_json::{from_str, from_value, to_string, to_value, Value}; |
6 | use failure::{bail, format_err}; | 6 | use failure::{bail, format_err}; |
7 | 7 | ||
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index fc10096e5..3c8c240cd 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -12,7 +12,6 @@ failure = "0.1.2" | |||
12 | failure_derive = "0.1.2" | 12 | failure_derive = "0.1.2" |
13 | serde_json = "1.0.24" | 13 | serde_json = "1.0.24" |
14 | serde = "1.0.71" | 14 | serde = "1.0.71" |
15 | serde_derive = "1.0.71" | ||
16 | drop_bomb = "0.1.0" | 15 | drop_bomb = "0.1.0" |
17 | crossbeam-channel = "0.2.4" | 16 | crossbeam-channel = "0.2.4" |
18 | flexi_logger = "0.10.0" | 17 | flexi_logger = "0.10.0" |
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs index 4497980e5..eae601f91 100644 --- a/crates/ra_lsp_server/src/main.rs +++ b/crates/ra_lsp_server/src/main.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | use serde_derive::Deserialize; | 1 | use serde::Deserialize; |
2 | use serde::Deserialize as _D; | ||
3 | use flexi_logger::{Duplicate, Logger}; | 2 | use flexi_logger::{Duplicate, Logger}; |
4 | use gen_lsp_server::{run_server, stdio_transport}; | 3 | use gen_lsp_server::{run_server, stdio_transport}; |
4 | |||
5 | use ra_lsp_server::Result; | 5 | use ra_lsp_server::Result; |
6 | 6 | ||
7 | fn main() -> Result<()> { | 7 | fn main() -> Result<()> { |
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs index 999792ecb..747ab8a8c 100644 --- a/crates/ra_lsp_server/src/req.rs +++ b/crates/ra_lsp_server/src/req.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | use serde_derive::{Serialize, Deserialize}; | 1 | use serde::{Serialize, Deserialize}; |
2 | use languageserver_types::{Location, Position, Range, TextDocumentIdentifier, Url}; | 2 | use languageserver_types::{Location, Position, Range, TextDocumentIdentifier, Url}; |
3 | use rustc_hash::FxHashMap; | 3 | use rustc_hash::FxHashMap; |
4 | use url_serde; | 4 | use url_serde; |