aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock63
-rw-r--r--crates/ra_proc_macro/src/lib.rs3
-rw-r--r--crates/ra_proc_macro_srv/Cargo.toml24
-rw-r--r--crates/ra_proc_macro_srv/src/lib.rs21
-rw-r--r--crates/ra_proc_macro_srv/src/main.rs55
5 files changed, 164 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c07a9614a..016044f11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -425,6 +425,17 @@ dependencies = [
425] 425]
426 426
427[[package]] 427[[package]]
428name = "goblin"
429version = "0.2.1"
430source = "registry+https://github.com/rust-lang/crates.io-index"
431checksum = "ddd5e3132801a1ac34ac53b97acde50c4685414dd2f291b9ea52afa6f07468c8"
432dependencies = [
433 "log",
434 "plain",
435 "scroll",
436]
437
438[[package]]
428name = "heck" 439name = "heck"
429version = "0.3.1" 440version = "0.3.1"
430source = "registry+https://github.com/rust-lang/crates.io-index" 441source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -596,6 +607,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
596checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" 607checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
597 608
598[[package]] 609[[package]]
610name = "libloading"
611version = "0.5.2"
612source = "registry+https://github.com/rust-lang/crates.io-index"
613checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
614dependencies = [
615 "cc",
616 "winapi 0.3.8",
617]
618
619[[package]]
599name = "linked-hash-map" 620name = "linked-hash-map"
600version = "0.5.2" 621version = "0.5.2"
601source = "registry+https://github.com/rust-lang/crates.io-index" 622source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -835,6 +856,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
835checksum = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc" 856checksum = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc"
836 857
837[[package]] 858[[package]]
859name = "plain"
860version = "0.2.3"
861source = "registry+https://github.com/rust-lang/crates.io-index"
862checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
863
864[[package]]
838name = "ppv-lite86" 865name = "ppv-lite86"
839version = "0.2.6" 866version = "0.2.6"
840source = "registry+https://github.com/rust-lang/crates.io-index" 867source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1084,6 +1111,22 @@ dependencies = [
1084] 1111]
1085 1112
1086[[package]] 1113[[package]]
1114name = "ra_proc_macro_srv"
1115version = "0.1.0"
1116dependencies = [
1117 "cargo_metadata",
1118 "difference",
1119 "goblin",
1120 "libloading",
1121 "ra_mbe",
1122 "ra_proc_macro",
1123 "ra_tt",
1124 "serde",
1125 "serde_derive",
1126 "serde_json",
1127]
1128
1129[[package]]
1087name = "ra_prof" 1130name = "ra_prof"
1088version = "0.1.0" 1131version = "0.1.0"
1089dependencies = [ 1132dependencies = [
@@ -1393,6 +1436,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1393checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" 1436checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
1394 1437
1395[[package]] 1438[[package]]
1439name = "scroll"
1440version = "0.10.1"
1441source = "registry+https://github.com/rust-lang/crates.io-index"
1442checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
1443dependencies = [
1444 "scroll_derive",
1445]
1446
1447[[package]]
1448name = "scroll_derive"
1449version = "0.10.1"
1450source = "registry+https://github.com/rust-lang/crates.io-index"
1451checksum = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
1452dependencies = [
1453 "proc-macro2",
1454 "quote",
1455 "syn",
1456]
1457
1458[[package]]
1396name = "semver" 1459name = "semver"
1397version = "0.9.0" 1460version = "0.9.0"
1398source = "registry+https://github.com/rust-lang/crates.io-index" 1461source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/crates/ra_proc_macro/src/lib.rs b/crates/ra_proc_macro/src/lib.rs
index 51fbb046a..63da9f1b4 100644
--- a/crates/ra_proc_macro/src/lib.rs
+++ b/crates/ra_proc_macro/src/lib.rs
@@ -11,13 +11,12 @@ pub mod msg;
11 11
12use process::{ProcMacroProcessSrv, ProcMacroProcessThread}; 12use process::{ProcMacroProcessSrv, ProcMacroProcessThread};
13use ra_tt::{SmolStr, Subtree}; 13use ra_tt::{SmolStr, Subtree};
14use rpc::ProcMacroKind;
15use std::{ 14use std::{
16 path::{Path, PathBuf}, 15 path::{Path, PathBuf},
17 sync::Arc, 16 sync::Arc,
18}; 17};
19 18
20pub use rpc::{ExpansionResult, ExpansionTask}; 19pub use rpc::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask, ProcMacroKind};
21 20
22#[derive(Debug, Clone)] 21#[derive(Debug, Clone)]
23pub struct ProcMacroProcessExpander { 22pub struct ProcMacroProcessExpander {
diff --git a/crates/ra_proc_macro_srv/Cargo.toml b/crates/ra_proc_macro_srv/Cargo.toml
new file mode 100644
index 000000000..fa2de2c91
--- /dev/null
+++ b/crates/ra_proc_macro_srv/Cargo.toml
@@ -0,0 +1,24 @@
1[package]
2edition = "2018"
3name = "ra_proc_macro_srv"
4version = "0.1.0"
5authors = ["rust-analyzer developers"]
6publish = false
7
8[lib]
9doctest = false
10
11[dependencies]
12ra_tt = { path = "../ra_tt" }
13ra_mbe = { path = "../ra_mbe" }
14ra_proc_macro = { path = "../ra_proc_macro" }
15
16serde_derive = "1.0.104"
17serde = "1.0.104"
18serde_json = "1.0.48"
19libloading = "0.5.2"
20goblin = "0.2.0"
21
22[dev-dependencies]
23cargo_metadata = "0.9.1"
24difference = "2.0.0"
diff --git a/crates/ra_proc_macro_srv/src/lib.rs b/crates/ra_proc_macro_srv/src/lib.rs
new file mode 100644
index 000000000..f77be1475
--- /dev/null
+++ b/crates/ra_proc_macro_srv/src/lib.rs
@@ -0,0 +1,21 @@
1//! RA Proc Macro Server
2//!
3//! This library is able to call compiled Rust custom derive dynamic libraries on arbitrary code.
4//! The general idea here is based on https://github.com/fedochet/rust-proc-macro-expander.
5//!
6//! But we change some several design for fitting RA needs:
7//!
8//! * We use `ra_tt` for proc-macro `TokenStream` server, it is easy to manipute and interact with
9//! RA then proc-macro2 token stream.
10//! * By **copying** the whole rustc `lib_proc_macro` code, we are able to build this with `stable`
11//! rustc rather than `unstable`. (Although in gerenal ABI compatibility is still an issue)
12
13use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask};
14
15pub fn expand_task(_task: &ExpansionTask) -> Result<ExpansionResult, String> {
16 unimplemented!()
17}
18
19pub fn list_macros(_task: &ListMacrosTask) -> Result<ListMacrosResult, String> {
20 unimplemented!()
21}
diff --git a/crates/ra_proc_macro_srv/src/main.rs b/crates/ra_proc_macro_srv/src/main.rs
new file mode 100644
index 000000000..70743c1f4
--- /dev/null
+++ b/crates/ra_proc_macro_srv/src/main.rs
@@ -0,0 +1,55 @@
1//! Driver for proc macro server
2
3use ra_proc_macro::msg::{self, Message};
4use ra_proc_macro_srv::{expand_task, list_macros};
5
6use std::io;
7
8fn read_request() -> Result<Option<msg::Request>, io::Error> {
9 let stdin = io::stdin();
10 let mut stdin = stdin.lock();
11 msg::Request::read(&mut stdin)
12}
13
14fn write_response(res: Result<msg::Response, String>) -> Result<(), io::Error> {
15 let msg: msg::Response = match res {
16 Ok(res) => res,
17 Err(err) => msg::Response::Error(msg::ResponseError {
18 code: msg::ErrorCode::ExpansionError,
19 message: err,
20 }),
21 };
22
23 let stdout = io::stdout();
24 let mut stdout = stdout.lock();
25 msg.write(&mut stdout)
26}
27fn main() {
28 loop {
29 let req = match read_request() {
30 Err(err) => {
31 eprintln!("Read message error on ra_proc_macro_srv: {}", err.to_string());
32 continue;
33 }
34 Ok(None) => continue,
35 Ok(Some(req)) => req,
36 };
37
38 match req {
39 msg::Request::ListMacro(task) => {
40 if let Err(err) =
41 write_response(list_macros(&task).map(|it| msg::Response::ListMacro(it)))
42 {
43 eprintln!("Write message error on list macro: {}", err);
44 }
45 }
46 msg::Request::ExpansionMacro(task) => {
47 if let Err(err) =
48 write_response(expand_task(&task).map(|it| msg::Response::ExpansionMacro(it)))
49 {
50 eprintln!("Write message error on expansion macro: {}", err);
51 }
52 }
53 }
54 }
55}