aboutsummaryrefslogtreecommitdiff
path: root/crates/proc_macro_srv/src
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-08-13 11:07:28 +0100
committerAleksey Kladov <[email protected]>2020-08-13 11:39:27 +0100
commit2119dc23e80d77f1abc789e3d99c34d429e17905 (patch)
tree977254cd7b4fa53da65836cd0f119ef404e7dd62 /crates/proc_macro_srv/src
parent4abdf323af5bc693f8b9ff3455e19ee1dff572a8 (diff)
Rename ra_proc_macro -> proc_macro_api
Diffstat (limited to 'crates/proc_macro_srv/src')
-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
4 files changed, 5 insertions, 5 deletions
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