Use () type instead of NoParams

Author: Xanewok

src/actions/mod.rs

@@ -23,7 +23,7 @@ use actions::post_build::{BuildResults, PostBuildHandler};
 use actions::notifications::BeginBuild;
 use build::*;
 use lsp_data::*;
-use server::{Output, Notification, NoParams};
+use server::{Output, Notification};
 
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
@@ -195,7 +195,7 @@ impl InitActionContext {
             }
         };
 
-        out.notify(Notification::<BeginBuild>::new(NoParams {}));
+        out.notify(Notification::<BeginBuild>::new(()));
         self.build_queue
             .request_build(project_path, priority, move |result| pbh.handle(result));
     }

src/actions/notifications.rs

@@ -21,7 +21,7 @@ use Span;
 
 use build::*;
 use lsp_data::*;
-use server::{Action, BlockingNotificationAction, LsState, NoParams, Output};
+use server::{Action, BlockingNotificationAction, LsState, Output};
 
 use std::thread;
 
@@ -30,7 +30,7 @@ use std::thread;
 pub struct Initialized;
 
 impl Action for Initialized {
-    type Params = NoParams;
+    type Params = ();
     const METHOD: &'static str = "initialized";
 }
 
@@ -395,7 +395,7 @@ impl Action for ShowMessage {
 pub struct DiagnosticsBegin;
 
 impl Action for DiagnosticsBegin {
-    type Params = NoParams;
+    type Params = ();
     const METHOD: &'static str = "rustDocument/diagnosticsBegin";
 }
 
@@ -408,7 +408,7 @@ impl Action for DiagnosticsBegin {
 pub struct DiagnosticsEnd;
 
 impl Action for DiagnosticsEnd {
-    type Params = NoParams;
+    type Params = ();
     const METHOD: &'static str = "rustDocument/diagnosticsEnd";
 }
 
@@ -417,6 +417,6 @@ impl Action for DiagnosticsEnd {
 pub struct BeginBuild;
 
 impl Action for BeginBuild {
-    type Params = NoParams;
+    type Params = ();
     const METHOD: &'static str = "rustDocument/beginBuild";
 }

src/actions/post_build.rs

@@ -16,7 +16,7 @@ use std::thread;
 use build::BuildResult;
 use lsp_data::{ls_util, PublishDiagnosticsParams};
 use actions::notifications::{DiagnosticsBegin, DiagnosticsEnd, PublishDiagnostics};
-use server::{Notification, Output, NoParams};
+use server::{Notification, Output};
 use CRATE_BLACKLIST;
 use Span;
 
@@ -41,7 +41,7 @@ pub struct PostBuildHandler<O: Output> {
 
 impl<O: Output> PostBuildHandler<O> {
     pub fn handle(self, result: BuildResult) {
-        self.out.notify(Notification::<DiagnosticsBegin>::new(NoParams {}));
+        self.out.notify(Notification::<DiagnosticsBegin>::new(()));
 
         match result {
             BuildResult::Success(messages, new_analysis)
@@ -60,16 +60,16 @@ impl<O: Output> PostBuildHandler<O> {
                         self.reload_analysis_from_memory(new_analysis);
                     }
 
-                    self.out.notify(Notification::<DiagnosticsEnd>::new(NoParams{}));
+                    self.out.notify(Notification::<DiagnosticsEnd>::new(()));
                 });
             }
             BuildResult::Squashed => {
                 trace!("build - Squashed");
-                self.out.notify(Notification::<DiagnosticsEnd>::new(NoParams{}));
+                self.out.notify(Notification::<DiagnosticsEnd>::new(()));
             }
             BuildResult::Err => {
                 trace!("build - Error");
-                self.out.notify(Notification::<DiagnosticsEnd>::new(NoParams{}));
+                self.out.notify(Notification::<DiagnosticsEnd>::new(()));
             }
         }
     }

src/cmd.rs

@@ -15,7 +15,7 @@
 use actions::requests;
 use analysis::{AnalysisHost, Target};
 use config::Config;
-use server::{self, LsService, NoParams, Notification, Request};
+use server::{self, LsService, Notification, Request};
 use vfs::Vfs;
 
 use ls_types::{ClientCapabilities, DocumentFormattingParams, DocumentRangeFormattingParams,
@@ -283,15 +283,15 @@ fn range_format(
 fn shutdown<'a>() -> Request<server::ShutdownRequest<'a>> {
     Request {
         id: next_id(),
-        params: NoParams {},
+        params: (),
         received: Instant::now(),
         _action: PhantomData,
     }
 }
 
 fn exit<'a>() -> Notification<server::ExitNotification<'a>> {
     Notification {
-        params: NoParams {},
+        params: () ,
         _action: PhantomData,
     }
 }

src/server/mod.rs

@@ -60,19 +60,6 @@ pub struct Ack;
 #[derive(Debug)]
 pub struct NoResponse;
 
-/// Empty extra parameters to some request or notification.
-#[derive(Debug, Serialize, PartialEq)]
-pub struct NoParams;
-
-impl<'de> Deserialize<'de> for NoParams {
-    fn deserialize<D>(_deserializer: D) -> Result<NoParams, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        Ok(NoParams)
-    }
-}
-
 /// A response to some request.
 pub trait Response {
     /// Send the response along the given output.
@@ -236,7 +223,7 @@ pub struct ShutdownRequest<'a> {
 }
 
 impl<'a> Action for ShutdownRequest<'a> {
-    type Params = NoParams;
+    type Params = ();
     const METHOD: &'static str = "shutdown";
 }
 
@@ -266,7 +253,7 @@ pub struct ExitNotification<'a> {
 }
 
 impl<'a> Action for ExitNotification<'a> {
-    type Params = NoParams;
+    type Params = ();
     const METHOD: &'static str = "exit";
 }
 
@@ -688,7 +675,7 @@ mod test {
 
         assert_eq!(
             notification,
-            Ok(Notification::<notifications::Initialized>::new(NoParams {}))
+            Ok(Notification::<notifications::Initialized>::new(()))
         );
     }
 }

src/test/mod.rs

@@ -16,7 +16,7 @@ mod harness;
 use analysis;
 use actions::requests;
 use config::{Config, Inferrable};
-use server::{self as ls_server, NoParams, Request, ShutdownRequest};
+use server::{self as ls_server, Request, ShutdownRequest};
 use jsonrpc_core;
 use vfs;
 
@@ -95,7 +95,7 @@ fn test_shutdown() {
 
     let messages = vec![
         initialize(0, root_path.as_os_str().to_str().map(|x| x.to_owned())).to_string(),
-        blocking_request::<ShutdownRequest>(1, NoParams).to_string(),
+        blocking_request::<ShutdownRequest>(1, ()).to_string(),
     ];
 
     let (mut server, results) = env.mock_server(messages);