aboutsummaryrefslogtreecommitdiff
path: root/crates/gen_lsp_server
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-01-14 11:32:28 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-01-14 11:32:28 +0000
commit8caff4e03475c20392f13e8c6ad469bd01a4b4ce (patch)
treeb7d46e7269b7af51241498be15ece1ef2e6b7ade /crates/gen_lsp_server
parente465032daf0d2594c09ad693b2ae816b96e883b2 (diff)
parent7e5ab9b78c313c3936cb7cb33de89e3c3c41f2bc (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')
-rw-r--r--crates/gen_lsp_server/Cargo.toml2
-rw-r--r--crates/gen_lsp_server/src/lib.rs6
-rw-r--r--crates/gen_lsp_server/src/msg.rs2
3 files changed, 5 insertions, 5 deletions
diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml
index a421a3e0b..041151741 100644
--- a/crates/gen_lsp_server/Cargo.toml
+++ b/crates/gen_lsp_server/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
8description = "Generic LSP server scaffold." 8description = "Generic LSP server scaffold."
9 9
10[dependencies] 10[dependencies]
11languageserver-types = "0.53.1" 11lsp-types = "0.54.0"
12log = "0.4.3" 12log = "0.4.3"
13failure = "0.1.4" 13failure = "0.1.4"
14serde_json = "1.0.34" 14serde_json = "1.0.34"
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;
65mod stdio; 65mod stdio;
66 66
67use crossbeam_channel::{Receiver, Sender}; 67use crossbeam_channel::{Receiver, Sender};
68use languageserver_types::{ 68use 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 @@
1use std::io::{BufRead, Write}; 1use std::io::{BufRead, Write};
2 2
3use languageserver_types::{notification::Notification, request::Request}; 3use lsp_types::{notification::Notification, request::Request};
4use serde::{Deserialize, Serialize}; 4use serde::{Deserialize, Serialize};
5use serde_json::{from_str, from_value, to_string, to_value, Value}; 5use serde_json::{from_str, from_value, to_string, to_value, Value};
6use failure::{bail, format_err}; 6use failure::{bail, format_err};