From 2119dc23e80d77f1abc789e3d99c34d429e17905 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 12:07:28 +0200 Subject: Rename ra_proc_macro -> proc_macro_api --- crates/proc_macro_srv/Cargo.toml | 2 +- crates/proc_macro_srv/src/cli.rs | 2 +- crates/proc_macro_srv/src/dylib.rs | 2 +- crates/proc_macro_srv/src/lib.rs | 4 ++-- crates/proc_macro_srv/src/tests/utils.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/proc_macro_srv') 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" tt = { path = "../tt" } mbe = { path = "../mbe" } -ra_proc_macro = { path = "../ra_proc_macro" } +proc_macro_api = { path = "../proc_macro_api" } test_utils = { path = "../test_utils" } [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 @@ //! Driver for proc macro server use crate::ProcMacroSrv; -use ra_proc_macro::msg::{self, Message}; +use proc_macro_api::msg::{self, Message}; use std::io; 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}; use goblin::{mach::Mach, Object}; use libloading::Library; use memmap::Mmap; -use ra_proc_macro::ProcMacroKind; +use proc_macro_api::ProcMacroKind; use std::io; 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 @@ //! * We use `tt` for proc-macro `TokenStream` server, it is easier to manipulate and interact with //! RA than `proc-macro2` token stream. //! * By **copying** the whole rustc `lib_proc_macro` code, we are able to build this with `stable` -//! rustc rather than `unstable`. (Although in gerenal ABI compatibility is still an issue) +//! rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)… #[allow(dead_code)] #[doc(hidden)] @@ -20,7 +20,7 @@ mod rustc_server; mod dylib; use proc_macro::bridge::client::TokenStream; -use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask}; +use proc_macro_api::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask}; use std::{ collections::{hash_map::Entry, HashMap}, 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 @@ use crate::dylib; use crate::ProcMacroSrv; -use ra_proc_macro::ListMacrosTask; +use proc_macro_api::ListMacrosTask; use std::str::FromStr; use test_utils::assert_eq_text; -- cgit v1.2.3