diff options
Diffstat (limited to 'crates/proc_macro_srv')
-rw-r--r-- | crates/proc_macro_srv/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/proc_macro_srv/src/cli.rs | 2 | ||||
-rw-r--r-- | crates/proc_macro_srv/src/dylib.rs | 2 | ||||
-rw-r--r-- | crates/proc_macro_srv/src/lib.rs | 4 | ||||
-rw-r--r-- | crates/proc_macro_srv/src/tests/utils.rs | 2 |
5 files changed, 6 insertions, 6 deletions
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 | ||
16 | tt = { path = "../tt" } | 16 | tt = { path = "../tt" } |
17 | mbe = { path = "../mbe" } | 17 | mbe = { path = "../mbe" } |
18 | ra_proc_macro = { path = "../ra_proc_macro" } | 18 | proc_macro_api = { path = "../proc_macro_api" } |
19 | test_utils = { path = "../test_utils" } | 19 | test_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 | ||
3 | use crate::ProcMacroSrv; | 3 | use crate::ProcMacroSrv; |
4 | use ra_proc_macro::msg::{self, Message}; | 4 | use proc_macro_api::msg::{self, Message}; |
5 | use std::io; | 5 | use std::io; |
6 | 6 | ||
7 | pub fn run() -> io::Result<()> { | 7 | pub 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}; | |||
7 | use goblin::{mach::Mach, Object}; | 7 | use goblin::{mach::Mach, Object}; |
8 | use libloading::Library; | 8 | use libloading::Library; |
9 | use memmap::Mmap; | 9 | use memmap::Mmap; |
10 | use ra_proc_macro::ProcMacroKind; | 10 | use proc_macro_api::ProcMacroKind; |
11 | use std::io; | 11 | use std::io; |
12 | 12 | ||
13 | const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_"; | 13 | const 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; | |||
20 | mod dylib; | 20 | mod dylib; |
21 | 21 | ||
22 | use proc_macro::bridge::client::TokenStream; | 22 | use proc_macro::bridge::client::TokenStream; |
23 | use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask}; | 23 | use proc_macro_api::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask}; |
24 | use std::{ | 24 | use 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 | ||
3 | use crate::dylib; | 3 | use crate::dylib; |
4 | use crate::ProcMacroSrv; | 4 | use crate::ProcMacroSrv; |
5 | use ra_proc_macro::ListMacrosTask; | 5 | use proc_macro_api::ListMacrosTask; |
6 | use std::str::FromStr; | 6 | use std::str::FromStr; |
7 | use test_utils::assert_eq_text; | 7 | use test_utils::assert_eq_text; |
8 | 8 | ||