Consistently use ls-types trait renames

Author: Xanewok

src/actions/notifications.rs

@@ -21,8 +21,6 @@ use Span;
 
 use build::*;
 use lsp_data::*;
-use lsp_data::request::Request as LSPRequest;
-use lsp_data::notification::Notification as LSPNotification;
 use lsp_data::request::{RangeFormatting, RegisterCapability, UnregisterCapability};
 use server::Request;
 

src/lsp_data.rs

@@ -22,6 +22,8 @@ use vfs::FileContents;
 use ls_types;
 
 pub use ls_types::*;
+pub use ls_types::request::Request as LSPRequest;
+pub use ls_types::notification::Notification as LSPNotification;
 
 /// Errors that can occur when parsing a file URI.
 #[derive(Debug)]
@@ -298,7 +300,7 @@ impl ClientCapabilities {
 #[derive(Debug)]
 pub enum DiagnosticsBegin { }
 
-impl notification::Notification for DiagnosticsBegin {
+impl LSPNotification for DiagnosticsBegin {
     type Params = ();
     const METHOD: &'static str = "rustDocument/diagnosticsBegin";
 }
@@ -311,7 +313,7 @@ impl notification::Notification for DiagnosticsBegin {
 #[derive(Debug)]
 pub enum DiagnosticsEnd { }
 
-impl notification::Notification for DiagnosticsEnd {
+impl LSPNotification for DiagnosticsEnd {
     type Params = ();
     const METHOD: &'static str = "rustDocument/diagnosticsEnd";
 }
@@ -320,7 +322,7 @@ impl notification::Notification for DiagnosticsEnd {
 #[derive(Debug)]
 pub enum BeginBuild { }
 
-impl notification::Notification for BeginBuild {
+impl LSPNotification for BeginBuild {
     type Params = ();
     const METHOD: &'static str = "rustDocument/beginBuild";
 }
@@ -331,9 +333,8 @@ impl notification::Notification for BeginBuild {
 #[derive(Debug)]
 pub enum FindImpls { }
 
-impl request::Request for FindImpls {
+impl LSPRequest for FindImpls {
     type Params = TextDocumentPositionParams;
     type Result = Vec<Location>;
     const METHOD: &'static str = "rustDocument/implementations";
 }
-

src/server/dispatch.rs

@@ -14,7 +14,7 @@ use server;
 use server::{Request, Response};
 use server::io::Output;
 use actions::InitActionContext;
-use ls_types::request::Request as LSPRequest;
+use lsp_data::LSPRequest;
 use std::sync::mpsc;
 use std::thread;
 use std::time::Duration;

src/server/io.rs

@@ -12,8 +12,7 @@ use serde;
 use serde_json;
 
 use super::{Notification, Request};
-use ls_types::notification::Notification as LSPNotification;
-use ls_types::request::Request as LSPRequest;
+use lsp_data::{LSPNotification, LSPRequest};
 
 use std::fmt;
 use std::io::{self, Read, Write};

src/server/mod.rs

@@ -30,8 +30,6 @@ use server::io::{StdioMsgReader, StdioOutput};
 use server::dispatch::Dispatcher;
 pub use server::dispatch::{RequestAction, ResponseError};
 
-use ls_types::notification::Notification as LSPNotification;
-use ls_types::request::Request as LSPRequest;
 pub use ls_types::request::Shutdown as ShutdownRequest;
 pub use ls_types::request::Initialize as InitializeRequest;
 pub use ls_types::notification::Exit as ExitNotification;
@@ -728,7 +726,7 @@ mod test {
         #[derive(Debug)]
         pub enum DummyNotification { }
 
-        impl notification::Notification for DummyNotification {
+        impl LSPNotification for DummyNotification {
             type Params = ();
             const METHOD: &'static str = "dummyNotification";
         }
@@ -754,7 +752,7 @@ mod test {
         #[derive(Serialize)]
         pub struct EmptyParams {}
 
-        impl notification::Notification for DummyNotification {
+        impl LSPNotification for DummyNotification {
             type Params = EmptyParams;
             const METHOD: &'static str = "dummyNotification";
         }