From 550d7fbe3cbf2af4a47fca6c9bbefaf798cd7b7b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 12 Aug 2020 16:46:20 +0200
Subject: Rename ra_tt -> tt

---
 crates/ra_proc_macro/src/msg.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'crates/ra_proc_macro/src/msg.rs')

diff --git a/crates/ra_proc_macro/src/msg.rs b/crates/ra_proc_macro/src/msg.rs
index 95d9b8804..f84ebdbc5 100644
--- a/crates/ra_proc_macro/src/msg.rs
+++ b/crates/ra_proc_macro/src/msg.rs
@@ -5,11 +5,12 @@ use std::{
     io::{self, BufRead, Write},
 };
 
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
+
 use crate::{
     rpc::{ListMacrosResult, ListMacrosTask},
     ExpansionResult, ExpansionTask,
 };
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub enum Request {
-- 
cgit v1.2.3


From 2119dc23e80d77f1abc789e3d99c34d429e17905 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 13 Aug 2020 12:07:28 +0200
Subject: Rename ra_proc_macro -> proc_macro_api

---
 crates/ra_proc_macro/src/msg.rs | 89 -----------------------------------------
 1 file changed, 89 deletions(-)
 delete mode 100644 crates/ra_proc_macro/src/msg.rs

(limited to 'crates/ra_proc_macro/src/msg.rs')

diff --git a/crates/ra_proc_macro/src/msg.rs b/crates/ra_proc_macro/src/msg.rs
deleted file mode 100644
index f84ebdbc5..000000000
--- a/crates/ra_proc_macro/src/msg.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-//! Defines messages for cross-process message passing based on `ndjson` wire protocol
-
-use std::{
-    convert::TryFrom,
-    io::{self, BufRead, Write},
-};
-
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-
-use crate::{
-    rpc::{ListMacrosResult, ListMacrosTask},
-    ExpansionResult, ExpansionTask,
-};
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub enum Request {
-    ListMacro(ListMacrosTask),
-    ExpansionMacro(ExpansionTask),
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub enum Response {
-    Error(ResponseError),
-    ListMacro(ListMacrosResult),
-    ExpansionMacro(ExpansionResult),
-}
-
-macro_rules! impl_try_from_response {
-    ($ty:ty, $tag:ident) => {
-        impl TryFrom<Response> for $ty {
-            type Error = &'static str;
-            fn try_from(value: Response) -> Result<Self, Self::Error> {
-                match value {
-                    Response::$tag(res) => Ok(res),
-                    _ => Err(concat!("Failed to convert response to ", stringify!($tag))),
-                }
-            }
-        }
-    };
-}
-
-impl_try_from_response!(ListMacrosResult, ListMacro);
-impl_try_from_response!(ExpansionResult, ExpansionMacro);
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct ResponseError {
-    pub code: ErrorCode,
-    pub message: String,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub enum ErrorCode {
-    ServerErrorEnd,
-    ExpansionError,
-}
-
-pub trait Message: Serialize + DeserializeOwned {
-    fn read(inp: &mut impl BufRead) -> io::Result<Option<Self>> {
-        Ok(match read_json(inp)? {
-            None => None,
-            Some(text) => Some(serde_json::from_str(&text)?),
-        })
-    }
-    fn write(self, out: &mut impl Write) -> io::Result<()> {
-        let text = serde_json::to_string(&self)?;
-        write_json(out, &text)
-    }
-}
-
-impl Message for Request {}
-impl Message for Response {}
-
-fn read_json(inp: &mut impl BufRead) -> io::Result<Option<String>> {
-    let mut buf = String::new();
-    inp.read_line(&mut buf)?;
-    buf.pop(); // Remove traling '\n'
-    Ok(match buf.len() {
-        0 => None,
-        _ => Some(buf),
-    })
-}
-
-fn write_json(out: &mut impl Write, msg: &str) -> io::Result<()> {
-    log::debug!("> {}", msg);
-    out.write_all(msg.as_bytes())?;
-    out.write_all(b"\n")?;
-    out.flush()?;
-    Ok(())
-}
-- 
cgit v1.2.3