aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock28
-rw-r--r--crates/proc_macro_api/Cargo.toml (renamed from crates/ra_proc_macro/Cargo.toml)5
-rw-r--r--crates/proc_macro_api/src/lib.rs (renamed from crates/ra_proc_macro/src/lib.rs)0
-rw-r--r--crates/proc_macro_api/src/msg.rs (renamed from crates/ra_proc_macro/src/msg.rs)0
-rw-r--r--crates/proc_macro_api/src/process.rs (renamed from crates/ra_proc_macro/src/process.rs)0
-rw-r--r--crates/proc_macro_api/src/rpc.rs (renamed from crates/ra_proc_macro/src/rpc.rs)2
-rw-r--r--crates/proc_macro_srv/Cargo.toml2
-rw-r--r--crates/proc_macro_srv/src/cli.rs2
-rw-r--r--crates/proc_macro_srv/src/dylib.rs2
-rw-r--r--crates/proc_macro_srv/src/lib.rs4
-rw-r--r--crates/proc_macro_srv/src/tests/utils.rs2
-rw-r--r--crates/project_model/Cargo.toml2
-rw-r--r--crates/project_model/src/lib.rs2
13 files changed, 26 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 89d0a60ec..9878dd88f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -910,6 +910,18 @@ dependencies = [
910] 910]
911 911
912[[package]] 912[[package]]
913name = "proc_macro_api"
914version = "0.1.0"
915dependencies = [
916 "crossbeam-channel",
917 "jod-thread",
918 "log",
919 "serde",
920 "serde_json",
921 "tt",
922]
923
924[[package]]
913name = "proc_macro_srv" 925name = "proc_macro_srv"
914version = "0.0.0" 926version = "0.0.0"
915dependencies = [ 927dependencies = [
@@ -919,7 +931,7 @@ dependencies = [
919 "libloading", 931 "libloading",
920 "mbe", 932 "mbe",
921 "memmap", 933 "memmap",
922 "ra_proc_macro", 934 "proc_macro_api",
923 "serde_derive", 935 "serde_derive",
924 "test_utils", 936 "test_utils",
925 "toolchain", 937 "toolchain",
@@ -948,8 +960,8 @@ dependencies = [
948 "cfg", 960 "cfg",
949 "log", 961 "log",
950 "paths", 962 "paths",
963 "proc_macro_api",
951 "ra_db", 964 "ra_db",
952 "ra_proc_macro",
953 "rustc-hash", 965 "rustc-hash",
954 "serde", 966 "serde",
955 "serde_json", 967 "serde_json",
@@ -1132,18 +1144,6 @@ dependencies = [
1132] 1144]
1133 1145
1134[[package]] 1146[[package]]
1135name = "ra_proc_macro"
1136version = "0.1.0"
1137dependencies = [
1138 "crossbeam-channel",
1139 "jod-thread",
1140 "log",
1141 "serde",
1142 "serde_json",
1143 "tt",
1144]
1145
1146[[package]]
1147name = "ra_ssr" 1147name = "ra_ssr"
1148version = "0.1.0" 1148version = "0.1.0"
1149dependencies = [ 1149dependencies = [
diff --git a/crates/ra_proc_macro/Cargo.toml b/crates/proc_macro_api/Cargo.toml
index d2d1bc228..c1abb5627 100644
--- a/crates/ra_proc_macro/Cargo.toml
+++ b/crates/proc_macro_api/Cargo.toml
@@ -1,6 +1,6 @@
1[package] 1[package]
2edition = "2018" 2edition = "2018"
3name = "ra_proc_macro" 3name = "proc_macro_api"
4version = "0.1.0" 4version = "0.1.0"
5authors = ["rust-analyzer developers"] 5authors = ["rust-analyzer developers"]
6publish = false 6publish = false
@@ -10,9 +10,10 @@ license = "MIT OR Apache-2.0"
10doctest = false 10doctest = false
11 11
12[dependencies] 12[dependencies]
13tt = { path = "../tt" }
14serde = { version = "1.0", features = ["derive"] } 13serde = { version = "1.0", features = ["derive"] }
15serde_json = "1.0" 14serde_json = "1.0"
16log = "0.4.8" 15log = "0.4.8"
17crossbeam-channel = "0.4.0" 16crossbeam-channel = "0.4.0"
18jod-thread = "0.1.1" 17jod-thread = "0.1.1"
18
19tt = { path = "../tt" }
diff --git a/crates/ra_proc_macro/src/lib.rs b/crates/proc_macro_api/src/lib.rs
index 15db57eb2..15db57eb2 100644
--- a/crates/ra_proc_macro/src/lib.rs
+++ b/crates/proc_macro_api/src/lib.rs
diff --git a/crates/ra_proc_macro/src/msg.rs b/crates/proc_macro_api/src/msg.rs
index f84ebdbc5..f84ebdbc5 100644
--- a/crates/ra_proc_macro/src/msg.rs
+++ b/crates/proc_macro_api/src/msg.rs
diff --git a/crates/ra_proc_macro/src/process.rs b/crates/proc_macro_api/src/process.rs
index 51ffcaa78..51ffcaa78 100644
--- a/crates/ra_proc_macro/src/process.rs
+++ b/crates/proc_macro_api/src/process.rs
diff --git a/crates/ra_proc_macro/src/rpc.rs b/crates/proc_macro_api/src/rpc.rs
index 5e5d78d06..47624163e 100644
--- a/crates/ra_proc_macro/src/rpc.rs
+++ b/crates/proc_macro_api/src/rpc.rs
@@ -1,4 +1,4 @@
1//! Data struture serialization related stuff for RPC 1//! Data structure serialization related stuff for RPC
2//! 2//!
3//! Defines all necessary rpc serialization data structures, 3//! Defines all necessary rpc serialization data structures,
4//! which includes `tt` related data and some task messages. 4//! which includes `tt` related data and some task messages.
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index 0954ffb66..7171f0808 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -15,7 +15,7 @@ memmap = "0.7"
15 15
16tt = { path = "../tt" } 16tt = { path = "../tt" }
17mbe = { path = "../mbe" } 17mbe = { path = "../mbe" }
18ra_proc_macro = { path = "../ra_proc_macro" } 18proc_macro_api = { path = "../proc_macro_api" }
19test_utils = { path = "../test_utils" } 19test_utils = { path = "../test_utils" }
20 20
21[dev-dependencies] 21[dev-dependencies]
diff --git a/crates/proc_macro_srv/src/cli.rs b/crates/proc_macro_srv/src/cli.rs
index 1437794c9..d428b9567 100644
--- a/crates/proc_macro_srv/src/cli.rs
+++ b/crates/proc_macro_srv/src/cli.rs
@@ -1,7 +1,7 @@
1//! Driver for proc macro server 1//! Driver for proc macro server
2 2
3use crate::ProcMacroSrv; 3use crate::ProcMacroSrv;
4use ra_proc_macro::msg::{self, Message}; 4use proc_macro_api::msg::{self, Message};
5use std::io; 5use std::io;
6 6
7pub fn run() -> io::Result<()> { 7pub fn run() -> io::Result<()> {
diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs
index 9b6cc91ef..f8f705da8 100644
--- a/crates/proc_macro_srv/src/dylib.rs
+++ b/crates/proc_macro_srv/src/dylib.rs
@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
7use goblin::{mach::Mach, Object}; 7use goblin::{mach::Mach, Object};
8use libloading::Library; 8use libloading::Library;
9use memmap::Mmap; 9use memmap::Mmap;
10use ra_proc_macro::ProcMacroKind; 10use proc_macro_api::ProcMacroKind;
11use std::io; 11use std::io;
12 12
13const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_"; 13const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_";
diff --git a/crates/proc_macro_srv/src/lib.rs b/crates/proc_macro_srv/src/lib.rs
index 1fc2eef82..7e4e4ad50 100644
--- a/crates/proc_macro_srv/src/lib.rs
+++ b/crates/proc_macro_srv/src/lib.rs
@@ -8,7 +8,7 @@
8//! * We use `tt` for proc-macro `TokenStream` server, it is easier to manipulate and interact with 8//! * We use `tt` for proc-macro `TokenStream` server, it is easier to manipulate and interact with
9//! RA than `proc-macro2` token stream. 9//! RA than `proc-macro2` token stream.
10//! * By **copying** the whole rustc `lib_proc_macro` code, we are able to build this with `stable` 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) 11//! rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)
12 12
13#[allow(dead_code)] 13#[allow(dead_code)]
14#[doc(hidden)] 14#[doc(hidden)]
@@ -20,7 +20,7 @@ mod rustc_server;
20mod dylib; 20mod dylib;
21 21
22use proc_macro::bridge::client::TokenStream; 22use proc_macro::bridge::client::TokenStream;
23use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask}; 23use proc_macro_api::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask};
24use std::{ 24use std::{
25 collections::{hash_map::Entry, HashMap}, 25 collections::{hash_map::Entry, HashMap},
26 fs, 26 fs,
diff --git a/crates/proc_macro_srv/src/tests/utils.rs b/crates/proc_macro_srv/src/tests/utils.rs
index 1b6a0b6fb..5828512d6 100644
--- a/crates/proc_macro_srv/src/tests/utils.rs
+++ b/crates/proc_macro_srv/src/tests/utils.rs
@@ -2,7 +2,7 @@
2 2
3use crate::dylib; 3use crate::dylib;
4use crate::ProcMacroSrv; 4use crate::ProcMacroSrv;
5use ra_proc_macro::ListMacrosTask; 5use proc_macro_api::ListMacrosTask;
6use std::str::FromStr; 6use std::str::FromStr;
7use test_utils::assert_eq_text; 7use test_utils::assert_eq_text;
8 8
diff --git a/crates/project_model/Cargo.toml b/crates/project_model/Cargo.toml
index 8d8d09387..1c84c7d20 100644
--- a/crates/project_model/Cargo.toml
+++ b/crates/project_model/Cargo.toml
@@ -20,6 +20,6 @@ arena = { path = "../arena" }
20cfg = { path = "../cfg" } 20cfg = { path = "../cfg" }
21ra_db = { path = "../ra_db" } 21ra_db = { path = "../ra_db" }
22toolchain = { path = "../toolchain" } 22toolchain = { path = "../toolchain" }
23ra_proc_macro = { path = "../ra_proc_macro" } 23proc_macro_api = { path = "../proc_macro_api" }
24paths = { path = "../paths" } 24paths = { path = "../paths" }
25stdx = { path = "../stdx" } 25stdx = { path = "../stdx" }
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index ee42198f3..234f908c9 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -25,7 +25,7 @@ pub use crate::{
25 sysroot::Sysroot, 25 sysroot::Sysroot,
26}; 26};
27 27
28pub use ra_proc_macro::ProcMacroClient; 28pub use proc_macro_api::ProcMacroClient;
29 29
30#[derive(Debug, Clone, Eq, PartialEq)] 30#[derive(Debug, Clone, Eq, PartialEq)]
31pub enum ProjectWorkspace { 31pub enum ProjectWorkspace {