aboutsummaryrefslogtreecommitdiff
path: root/crates/gen_lsp_server/src/lib.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-12-30 20:02:26 +0000
committerAleksey Kladov <[email protected]>2018-12-30 20:02:26 +0000
commiteffc1eae8be338ea949058cc89c39950c25858c5 (patch)
tree05d34a0020e1a14791d1b33dfe26572cadce457a /crates/gen_lsp_server/src/lib.rs
parentc0d1b17a4e976e07966a1d7f545b6e01d278fd08 (diff)
migrate gen-lsp-server to new crossbeam
Diffstat (limited to 'crates/gen_lsp_server/src/lib.rs')
-rw-r--r--crates/gen_lsp_server/src/lib.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/gen_lsp_server/src/lib.rs b/crates/gen_lsp_server/src/lib.rs
index 8779fbf0f..b20652928 100644
--- a/crates/gen_lsp_server/src/lib.rs
+++ b/crates/gen_lsp_server/src/lib.rs
@@ -95,7 +95,7 @@ pub fn run_server(
95 server(params, &receiver, &sender)?; 95 server(params, &receiver, &sender)?;
96 log::info!("lsp server waiting for exit notification"); 96 log::info!("lsp server waiting for exit notification");
97 match receiver.recv() { 97 match receiver.recv() {
98 Some(RawMessage::Notification(n)) => n 98 Ok(RawMessage::Notification(n)) => n
99 .cast::<Exit>() 99 .cast::<Exit>()
100 .map_err(|n| format_err!("unexpected notification during shutdown: {:?}", n))?, 100 .map_err(|n| format_err!("unexpected notification during shutdown: {:?}", n))?,
101 m => bail!("unexpected message during shutdown: {:?}", m), 101 m => bail!("unexpected message during shutdown: {:?}", m),
@@ -109,7 +109,7 @@ pub fn handle_shutdown(req: RawRequest, sender: &Sender<RawMessage>) -> Option<R
109 match req.cast::<Shutdown>() { 109 match req.cast::<Shutdown>() {
110 Ok((id, ())) => { 110 Ok((id, ())) => {
111 let resp = RawResponse::ok::<Shutdown>(id, &()); 111 let resp = RawResponse::ok::<Shutdown>(id, &());
112 sender.send(RawMessage::Response(resp)); 112 let _ = sender.send(RawMessage::Response(resp));
113 None 113 None
114 } 114 }
115 Err(req) => Some(req), 115 Err(req) => Some(req),
@@ -122,16 +122,16 @@ fn initialize(
122 caps: ServerCapabilities, 122 caps: ServerCapabilities,
123) -> Result<InitializeParams> { 123) -> Result<InitializeParams> {
124 let (id, params) = match receiver.recv() { 124 let (id, params) = match receiver.recv() {
125 Some(RawMessage::Request(req)) => match req.cast::<Initialize>() { 125 Ok(RawMessage::Request(req)) => match req.cast::<Initialize>() {
126 Err(req) => bail!("expected initialize request, got {:?}", req), 126 Err(req) => bail!("expected initialize request, got {:?}", req),
127 Ok(req) => req, 127 Ok(req) => req,
128 }, 128 },
129 msg => bail!("expected initialize request, got {:?}", msg), 129 msg => bail!("expected initialize request, got {:?}", msg),
130 }; 130 };
131 let resp = RawResponse::ok::<Initialize>(id, &InitializeResult { capabilities: caps }); 131 let resp = RawResponse::ok::<Initialize>(id, &InitializeResult { capabilities: caps });
132 sender.send(RawMessage::Response(resp)); 132 sender.send(RawMessage::Response(resp)).unwrap();
133 match receiver.recv() { 133 match receiver.recv() {
134 Some(RawMessage::Notification(n)) => { 134 Ok(RawMessage::Notification(n)) => {
135 n.cast::<Initialized>() 135 n.cast::<Initialized>()
136 .map_err(|_| format_err!("expected initialized notification"))?; 136 .map_err(|_| format_err!("expected initialized notification"))?;
137 } 137 }