diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-14 11:32:28 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-14 11:32:28 +0000 |
commit | 8caff4e03475c20392f13e8c6ad469bd01a4b4ce (patch) | |
tree | b7d46e7269b7af51241498be15ece1ef2e6b7ade /crates/gen_lsp_server/src | |
parent | e465032daf0d2594c09ad693b2ae816b96e883b2 (diff) | |
parent | 7e5ab9b78c313c3936cb7cb33de89e3c3c41f2bc (diff) |
Merge #537
537: switch to lsp-types r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/gen_lsp_server/src')
-rw-r--r-- | crates/gen_lsp_server/src/lib.rs | 6 | ||||
-rw-r--r-- | crates/gen_lsp_server/src/msg.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/gen_lsp_server/src/lib.rs b/crates/gen_lsp_server/src/lib.rs index 16ac799ac..edbdda6c8 100644 --- a/crates/gen_lsp_server/src/lib.rs +++ b/crates/gen_lsp_server/src/lib.rs | |||
@@ -6,12 +6,12 @@ | |||
6 | //! | 6 | //! |
7 | //! ```no_run | 7 | //! ```no_run |
8 | //! extern crate gen_lsp_server; | 8 | //! extern crate gen_lsp_server; |
9 | //! extern crate languageserver_types; | 9 | //! extern crate lsp_types; |
10 | //! extern crate failure; | 10 | //! extern crate failure; |
11 | //! extern crate crossbeam_channel; | 11 | //! extern crate crossbeam_channel; |
12 | //! | 12 | //! |
13 | //! use crossbeam_channel::{Sender, Receiver}; | 13 | //! use crossbeam_channel::{Sender, Receiver}; |
14 | //! use languageserver_types::{ServerCapabilities, InitializeParams, request::{GotoDefinition, GotoDefinitionResponse}}; | 14 | //! use lsp_types::{ServerCapabilities, InitializeParams, request::{GotoDefinition, GotoDefinitionResponse}}; |
15 | //! use gen_lsp_server::{run_server, stdio_transport, handle_shutdown, RawMessage, RawResponse}; | 15 | //! use gen_lsp_server::{run_server, stdio_transport, handle_shutdown, RawMessage, RawResponse}; |
16 | //! | 16 | //! |
17 | //! fn main() -> Result<(), failure::Error> { | 17 | //! fn main() -> Result<(), failure::Error> { |
@@ -65,7 +65,7 @@ mod msg; | |||
65 | mod stdio; | 65 | mod stdio; |
66 | 66 | ||
67 | use crossbeam_channel::{Receiver, Sender}; | 67 | use crossbeam_channel::{Receiver, Sender}; |
68 | use languageserver_types::{ | 68 | use lsp_types::{ |
69 | notification::{Exit, Initialized}, | 69 | notification::{Exit, Initialized}, |
70 | request::{Initialize, Shutdown}, | 70 | request::{Initialize, Shutdown}, |
71 | InitializeParams, InitializeResult, ServerCapabilities, | 71 | InitializeParams, InitializeResult, ServerCapabilities, |
diff --git a/crates/gen_lsp_server/src/msg.rs b/crates/gen_lsp_server/src/msg.rs index 94bef374c..818111fe7 100644 --- a/crates/gen_lsp_server/src/msg.rs +++ b/crates/gen_lsp_server/src/msg.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | use std::io::{BufRead, Write}; | 1 | use std::io::{BufRead, Write}; |
2 | 2 | ||
3 | use languageserver_types::{notification::Notification, request::Request}; | 3 | use lsp_types::{notification::Notification, request::Request}; |
4 | use serde::{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}; |