aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-08-13 09:03:01 +0100
committerGitHub <[email protected]>2020-08-13 09:03:01 +0100
commit6fc43dc15e7b81ec4a701b0581202c1ecc4ae744 (patch)
treec08cb7cd48089c1c7316ff2570de02df76e9d9ef
parentf277ec27ac024992e8b8834c68e16b31c983be1b (diff)
parent349e6c62ada1fa45a8b80edb877b5e7c9d0c306d (diff)
Merge pull request #5734 from pksunkara/ra_proc_macro_srv
Rename ra_proc_macro_srv -> proc_macro_srv
-rw-r--r--Cargo.lock6
-rw-r--r--crates/proc_macro_srv/Cargo.toml (renamed from crates/ra_proc_macro_srv/Cargo.toml)9
-rw-r--r--crates/proc_macro_srv/src/cli.rs (renamed from crates/ra_proc_macro_srv/src/cli.rs)0
-rw-r--r--crates/proc_macro_srv/src/dylib.rs (renamed from crates/ra_proc_macro_srv/src/dylib.rs)0
-rw-r--r--crates/proc_macro_srv/src/lib.rs (renamed from crates/ra_proc_macro_srv/src/lib.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/bridge/buffer.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/bridge/buffer.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/bridge/client.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/bridge/closure.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/bridge/handle.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/bridge/handle.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/bridge/mod.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/bridge/rpc.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/bridge/server.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/bridge/server.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/diagnostic.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/diagnostic.rs)0
-rw-r--r--crates/proc_macro_srv/src/proc_macro/mod.rs (renamed from crates/ra_proc_macro_srv/src/proc_macro/mod.rs)0
-rw-r--r--crates/proc_macro_srv/src/rustc_server.rs (renamed from crates/ra_proc_macro_srv/src/rustc_server.rs)0
-rw-r--r--crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt (renamed from crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt)0
-rw-r--r--crates/proc_macro_srv/src/tests/mod.rs (renamed from crates/ra_proc_macro_srv/src/tests/mod.rs)0
-rw-r--r--crates/proc_macro_srv/src/tests/utils.rs (renamed from crates/ra_proc_macro_srv/src/tests/utils.rs)0
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--crates/rust-analyzer/src/bin/main.rs2
-rw-r--r--crates/rust-analyzer/src/reload.rs2
22 files changed, 10 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c95ef002d..efc17c430 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1133,8 +1133,8 @@ dependencies = [
1133] 1133]
1134 1134
1135[[package]] 1135[[package]]
1136name = "ra_proc_macro_srv" 1136name = "proc_macro_srv"
1137version = "0.1.0" 1137version = "0.0.0"
1138dependencies = [ 1138dependencies = [
1139 "cargo_metadata", 1139 "cargo_metadata",
1140 "difference", 1140 "difference",
@@ -1280,7 +1280,7 @@ dependencies = [
1280 "ra_ide", 1280 "ra_ide",
1281 "ra_ide_db", 1281 "ra_ide_db",
1282 "ra_mbe", 1282 "ra_mbe",
1283 "ra_proc_macro_srv", 1283 "proc_macro_srv",
1284 "ra_project_model", 1284 "ra_project_model",
1285 "ra_ssr", 1285 "ra_ssr",
1286 "rayon", 1286 "rayon",
diff --git a/crates/ra_proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index 1c25e7229..775af890e 100644
--- a/crates/ra_proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -1,10 +1,9 @@
1[package] 1[package]
2edition = "2018" 2name = "proc_macro_srv"
3name = "ra_proc_macro_srv" 3version = "0.0.0"
4version = "0.1.0"
5authors = ["rust-analyzer developers"]
6publish = false
7license = "MIT OR Apache-2.0" 4license = "MIT OR Apache-2.0"
5authors = ["rust-analyzer developers"]
6edition = "2018"
8 7
9[lib] 8[lib]
10doctest = false 9doctest = false
diff --git a/crates/ra_proc_macro_srv/src/cli.rs b/crates/proc_macro_srv/src/cli.rs
index 1437794c9..1437794c9 100644
--- a/crates/ra_proc_macro_srv/src/cli.rs
+++ b/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
index 9b6cc91ef..9b6cc91ef 100644
--- a/crates/ra_proc_macro_srv/src/dylib.rs
+++ b/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
index 1fc2eef82..1fc2eef82 100644
--- a/crates/ra_proc_macro_srv/src/lib.rs
+++ b/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
index dae6ff1d1..dae6ff1d1 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/buffer.rs
+++ b/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
index cb4b3bdb0..cb4b3bdb0 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs
+++ b/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
index 273a97715..273a97715 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs
+++ b/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
index a2f77b5ac..a2f77b5ac 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/handle.rs
+++ b/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
index aeb05aad4..aeb05aad4 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs
+++ b/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
index 3528d5c99..3528d5c99 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/rpc.rs
+++ b/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
index 6ef7ea43c..6ef7ea43c 100644
--- 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
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
index 45d41ac02..45d41ac02 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/server.rs
+++ b/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
index 55d93917c..55d93917c 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/diagnostic.rs
+++ b/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
index ee0dc9722..ee0dc9722 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/mod.rs
+++ b/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
index d534d1337..d534d1337 100644
--- a/crates/ra_proc_macro_srv/src/rustc_server.rs
+++ b/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
index e6fd21610..e6fd21610 100644
--- 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
diff --git a/crates/ra_proc_macro_srv/src/tests/mod.rs b/crates/proc_macro_srv/src/tests/mod.rs
index 8e6f28abd..8e6f28abd 100644
--- a/crates/ra_proc_macro_srv/src/tests/mod.rs
+++ b/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
index 1b6a0b6fb..1b6a0b6fb 100644
--- a/crates/ra_proc_macro_srv/src/tests/utils.rs
+++ b/crates/proc_macro_srv/src/tests/utils.rs
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 86c786e25..7713ed7ea 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -52,7 +52,7 @@ ra_ssr = { path = "../ra_ssr" }
52hir = { path = "../ra_hir", package = "ra_hir" } 52hir = { path = "../ra_hir", package = "ra_hir" }
53hir_def = { path = "../ra_hir_def", package = "ra_hir_def" } 53hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
54hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" } 54hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" }
55ra_proc_macro_srv = { path = "../ra_proc_macro_srv" } 55proc_macro_srv = { path = "../proc_macro_srv" }
56 56
57[target.'cfg(windows)'.dependencies] 57[target.'cfg(windows)'.dependencies]
58winapi = "0.3.8" 58winapi = "0.3.8"
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index 9622d71c0..f177f8709 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<()> {
30 let args = args::Args::parse()?; 30 let args = args::Args::parse()?;
31 match args.command { 31 match args.command {
32 args::Command::RunServer => run_server()?, 32 args::Command::RunServer => run_server()?,
33 args::Command::ProcMacro => ra_proc_macro_srv::cli::run()?, 33 args::Command::ProcMacro => proc_macro_srv::cli::run()?,
34 34
35 args::Command::Parse { no_dump } => cli::parse(no_dump)?, 35 args::Command::Parse { no_dump } => cli::parse(no_dump)?,
36 args::Command::Symbols => cli::symbols()?, 36 args::Command::Symbols => cli::symbols()?,
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index f74f2c02c..611c9a89f 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -176,7 +176,7 @@ impl GlobalState {
176 Ok(it) => it, 176 Ok(it) => it,
177 Err(err) => { 177 Err(err) => {
178 log::error!( 178 log::error!(
179 "Failed to run ra_proc_macro_srv from path {}, error: {:?}", 179 "Failed to run proc_macro_srv from path {}, error: {:?}",
180 path.display(), 180 path.display(),
181 err 181 err
182 ); 182 );