From 349e6c62ada1fa45a8b80edb877b5e7c9d0c306d Mon Sep 17 00:00:00 2001 From: Pavan Kumar Sunkara Date: Thu, 13 Aug 2020 02:57:26 +0200 Subject: [PATCH] Rename ra_proc_macro_srv -> proc_macro_srv --- Cargo.lock | 6 +++--- crates/{ra_proc_macro_srv => proc_macro_srv}/Cargo.toml | 9 ++++----- crates/{ra_proc_macro_srv => proc_macro_srv}/src/cli.rs | 0 .../{ra_proc_macro_srv => proc_macro_srv}/src/dylib.rs | 0 crates/{ra_proc_macro_srv => proc_macro_srv}/src/lib.rs | 0 .../src/proc_macro/bridge/buffer.rs | 0 .../src/proc_macro/bridge/client.rs | 0 .../src/proc_macro/bridge/closure.rs | 0 .../src/proc_macro/bridge/handle.rs | 0 .../src/proc_macro/bridge/mod.rs | 0 .../src/proc_macro/bridge/rpc.rs | 0 .../src/proc_macro/bridge/scoped_cell.rs | 0 .../src/proc_macro/bridge/server.rs | 0 .../src/proc_macro/diagnostic.rs | 0 .../src/proc_macro/mod.rs | 0 .../src/rustc_server.rs | 0 .../src/tests/fixtures/test_serialize_proc_macro.txt | 0 .../src/tests/mod.rs | 0 .../src/tests/utils.rs | 0 crates/rust-analyzer/Cargo.toml | 2 +- crates/rust-analyzer/src/bin/main.rs | 2 +- crates/rust-analyzer/src/reload.rs | 2 +- 22 files changed, 10 insertions(+), 11 deletions(-) rename crates/{ra_proc_macro_srv => proc_macro_srv}/Cargo.toml (88%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/cli.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/dylib.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/lib.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/bridge/buffer.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/bridge/client.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/bridge/closure.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/bridge/handle.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/bridge/mod.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/bridge/rpc.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/bridge/scoped_cell.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/bridge/server.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/diagnostic.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/proc_macro/mod.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/rustc_server.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/tests/fixtures/test_serialize_proc_macro.txt (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/tests/mod.rs (100%) rename crates/{ra_proc_macro_srv => proc_macro_srv}/src/tests/utils.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index c95ef002d3..efc17c4301 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1133,8 +1133,8 @@ dependencies = [ ] [[package]] -name = "ra_proc_macro_srv" -version = "0.1.0" +name = "proc_macro_srv" +version = "0.0.0" dependencies = [ "cargo_metadata", "difference", @@ -1280,7 +1280,7 @@ dependencies = [ "ra_ide", "ra_ide_db", "ra_mbe", - "ra_proc_macro_srv", + "proc_macro_srv", "ra_project_model", "ra_ssr", "rayon", diff --git a/crates/ra_proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml similarity index 88% rename from crates/ra_proc_macro_srv/Cargo.toml rename to crates/proc_macro_srv/Cargo.toml index 1c25e72296..775af890eb 100644 --- a/crates/ra_proc_macro_srv/Cargo.toml +++ b/crates/proc_macro_srv/Cargo.toml @@ -1,10 +1,9 @@ [package] -edition = "2018" -name = "ra_proc_macro_srv" -version = "0.1.0" -authors = ["rust-analyzer developers"] -publish = false +name = "proc_macro_srv" +version = "0.0.0" license = "MIT OR Apache-2.0" +authors = ["rust-analyzer developers"] +edition = "2018" [lib] doctest = false diff --git a/crates/ra_proc_macro_srv/src/cli.rs b/crates/proc_macro_srv/src/cli.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/cli.rs rename to crates/proc_macro_srv/src/cli.rs diff --git a/crates/ra_proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/dylib.rs rename to crates/proc_macro_srv/src/dylib.rs diff --git a/crates/ra_proc_macro_srv/src/lib.rs b/crates/proc_macro_srv/src/lib.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/lib.rs rename to crates/proc_macro_srv/src/lib.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/buffer.rs b/crates/proc_macro_srv/src/proc_macro/bridge/buffer.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/bridge/buffer.rs rename to crates/proc_macro_srv/src/proc_macro/bridge/buffer.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs rename to crates/proc_macro_srv/src/proc_macro/bridge/client.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs b/crates/proc_macro_srv/src/proc_macro/bridge/closure.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs rename to crates/proc_macro_srv/src/proc_macro/bridge/closure.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/handle.rs b/crates/proc_macro_srv/src/proc_macro/bridge/handle.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/bridge/handle.rs rename to crates/proc_macro_srv/src/proc_macro/bridge/handle.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs rename to crates/proc_macro_srv/src/proc_macro/bridge/mod.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/rpc.rs b/crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/bridge/rpc.rs rename to crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs b/crates/proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs rename to crates/proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/bridge/server.rs rename to crates/proc_macro_srv/src/proc_macro/bridge/server.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/diagnostic.rs b/crates/proc_macro_srv/src/proc_macro/diagnostic.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/diagnostic.rs rename to crates/proc_macro_srv/src/proc_macro/diagnostic.rs diff --git a/crates/ra_proc_macro_srv/src/proc_macro/mod.rs b/crates/proc_macro_srv/src/proc_macro/mod.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/proc_macro/mod.rs rename to crates/proc_macro_srv/src/proc_macro/mod.rs diff --git a/crates/ra_proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/rustc_server.rs rename to crates/proc_macro_srv/src/rustc_server.rs diff --git a/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt similarity index 100% rename from crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt rename to crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt diff --git a/crates/ra_proc_macro_srv/src/tests/mod.rs b/crates/proc_macro_srv/src/tests/mod.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/tests/mod.rs rename to crates/proc_macro_srv/src/tests/mod.rs diff --git a/crates/ra_proc_macro_srv/src/tests/utils.rs b/crates/proc_macro_srv/src/tests/utils.rs similarity index 100% rename from crates/ra_proc_macro_srv/src/tests/utils.rs rename to crates/proc_macro_srv/src/tests/utils.rs diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 86c786e25c..7713ed7eab 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -52,7 +52,7 @@ ra_ssr = { path = "../ra_ssr" } hir = { path = "../ra_hir", package = "ra_hir" } hir_def = { path = "../ra_hir_def", package = "ra_hir_def" } hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" } -ra_proc_macro_srv = { path = "../ra_proc_macro_srv" } +proc_macro_srv = { path = "../proc_macro_srv" } [target.'cfg(windows)'.dependencies] winapi = "0.3.8" diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs index 9622d71c06..f177f8709a 100644 --- a/crates/rust-analyzer/src/bin/main.rs +++ b/crates/rust-analyzer/src/bin/main.rs @@ -30,7 +30,7 @@ fn try_main() -> Result<()> { let args = args::Args::parse()?; match args.command { args::Command::RunServer => run_server()?, - args::Command::ProcMacro => ra_proc_macro_srv::cli::run()?, + args::Command::ProcMacro => proc_macro_srv::cli::run()?, args::Command::Parse { no_dump } => cli::parse(no_dump)?, args::Command::Symbols => cli::symbols()?, diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs index f74f2c02c8..611c9a89f5 100644 --- a/crates/rust-analyzer/src/reload.rs +++ b/crates/rust-analyzer/src/reload.rs @@ -176,7 +176,7 @@ impl GlobalState { Ok(it) => it, Err(err) => { log::error!( - "Failed to run ra_proc_macro_srv from path {}, error: {:?}", + "Failed to run proc_macro_srv from path {}, error: {:?}", path.display(), err );