Revert "Use proper ids for server->client messages" on branch rustfmt-42492

Cargo.toml

@@ -20,7 +20,7 @@ rls-analysis = "0.4"
 rls-data = "0.7"
 rls-span = { version = "0.4" , features = ["serialize-serde"] }
 rls-vfs = { version = "0.4", features = ["racer-impls"] }
-rustfmt-nightly = "0.1"
+rustfmt-nightly = { git = "https://github.com/rust-lang-nursery/rustfmt", branch = "rustfmt-42492" }
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"

src/actions/mod.rs

@@ -471,8 +471,7 @@ impl ActionHandler {
         trace!("apply_suggestion {:?} {}", location, new_text);
         // FIXME should handle the response
         let output = serde_json::to_string(
-            &RequestMessage::new(out.provide_id(),
-                                 "workspace/applyEdit".to_owned(),
+            &RequestMessage::new("workspace/applyEdit".to_owned(),
                                  ApplyWorkspaceEditParams { edit: make_workspace_edit(location, new_text) })
         ).unwrap();
         out.response(output);
@@ -564,8 +563,7 @@ impl ActionHandler {
         // Send a workspace edit to make the actual change.
         // FIXME should handle the response
         let output = serde_json::to_string(
-            &RequestMessage::new(out.provide_id(),
-                                 "workspace/applyEdit".to_owned(),
+            &RequestMessage::new("workspace/applyEdit".to_owned(),
                                  ApplyWorkspaceEditParams { edit: make_workspace_edit(location, deglob_str) })
         ).unwrap();
         out.response(output);
@@ -660,16 +658,14 @@ impl ActionHandler {
                 // FIXME should handle the response
                 if unstable_features {
                     let output = serde_json::to_string(
-                        &RequestMessage::new(out.provide_id(),
-                                             NOTIFICATION__RegisterCapability.to_owned(),
+                        &RequestMessage::new(NOTIFICATION__RegisterCapability.to_owned(),
                                              RegistrationParams { registrations: vec![Registration { id: RANGE_FORMATTING_ID.to_owned(), method: REQUEST__RangeFormatting.to_owned(), register_options: serde_json::Value::Null },
                                                                                       Registration { id: RENAME_ID.to_owned(), method: REQUEST__Rename.to_owned(), register_options: serde_json::Value::Null }] })
                     ).unwrap();
                     out.response(output);
                 } else {
                     let output = serde_json::to_string(
-                        &RequestMessage::new(out.provide_id(),
-                                             NOTIFICATION__UnregisterCapability.to_owned(),
+                        &RequestMessage::new(NOTIFICATION__UnregisterCapability.to_owned(),
                                              UnregistrationParams { unregisterations: vec![Unregistration { id: RANGE_FORMATTING_ID.to_owned(), method: REQUEST__RangeFormatting.to_owned() },
                                                                                            Unregistration { id: RENAME_ID.to_owned(), method: REQUEST__Rename.to_owned() }] })
                     ).unwrap();

src/cmd.rs

@@ -193,10 +193,6 @@ impl server::Output for PrintlnOutput {
         println!("{}", output);
     }
 
-    fn provide_id(&self) -> u64 {
-        0
-    }
-
     fn success(&self, id: usize, data: ResponseData) {
         println!("{}: {:#?}", id, data);
     }

src/lsp_data.rs

@@ -200,16 +200,16 @@ pub struct RequestMessage<T>
     where T: Debug + Serialize
 {
     jsonrpc: &'static str,
-    pub id: u64,
+    pub id: String,
     pub method: String,
     pub params: T,
 }
 
 impl <T> RequestMessage<T> where T: Debug + Serialize {
-    pub fn new(id: u64, method: String, params: T) -> Self {
+    pub fn new(method: String, params: T) -> Self {
         RequestMessage {
             jsonrpc: "2.0",
-            id,
+            id: "FIXME".to_owned(),
             method: method,
             params: params
         }

src/main.rs

@@ -11,7 +11,6 @@
 #![feature(rustc_private)]
 #![feature(concat_idents)]
 #![feature(type_ascription)]
-#![feature(integer_atomics)]
 
 extern crate cargo;
 #[macro_use]

src/server.rs

@@ -18,7 +18,7 @@ use actions::ActionHandler;
 use std::fmt;
 use std::io::{self, Read, Write, ErrorKind};
 use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering, AtomicU64};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::path::PathBuf;
 
 #[cfg(test)]
@@ -547,7 +547,6 @@ impl MessageReader for StdioMsgReader {
 
 pub trait Output: Sync + Send + Clone + 'static {
     fn response(&self, output: String);
-    fn provide_id(&self) -> u64;
 
     fn parse_error(&self) {
         self.response(r#"{"jsonrpc": "2.0", "error": {"code": -32700, "message": "Parse error"}, "id": null}"#.to_owned());
@@ -602,17 +601,7 @@ pub trait Output: Sync + Send + Clone + 'static {
 }
 
 #[derive(Clone)]
-struct StdioOutput {
-    next_id: Arc<AtomicU64>,
-}
-
-impl StdioOutput {
-    pub fn new() -> StdioOutput {
-        StdioOutput {
-            next_id: Arc::new(AtomicU64::new(1)),
-        }
-    }
-}
+struct StdioOutput;
 
 impl Output for StdioOutput {
     fn response(&self, output: String) {
@@ -623,18 +612,14 @@ impl Output for StdioOutput {
         print!("{}", o);
         io::stdout().flush().unwrap();
     }
-
-    fn provide_id(&self) -> u64 {
-        self.next_id.fetch_add(1, Ordering::SeqCst)
-    }
 }
 
 pub fn run_server(analysis: Arc<AnalysisHost>, vfs: Arc<Vfs>) {
     debug!("Language Server Starting up");
     let service = LsService::new(analysis,
                                  vfs,
                                  Box::new(StdioMsgReader),
-                                 StdioOutput::new());
+                                 StdioOutput);
     LsService::run(service);
     debug!("Server shutting down");
 }

src/test/harness.rs

@@ -89,10 +89,6 @@ impl ls_server::Output for RecordOutput {
         let mut records = self.output.lock().unwrap();
         records.push(output);
     }
-
-    fn provide_id(&self) -> u64 {
-        0
-    }
 }
 
 #[derive(Clone, Debug)]