Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5734 from pksunkara/ra_proc_macro_srv

Browse source 
Rename ra_proc_macro_srv -> proc_macro_srv
This commit is contained in:
Aleksey Kladov 2020-08-13 10:03:01 +02:00 committed by GitHub
commit 6fc43dc15e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -1133,8 +1133,8 @@ dependencies = [
] ]
[[package]] [[package]]
name = "ra_proc_macro_srv" name = "proc_macro_srv"
version = "0.1.0" version = "0.0.0"
dependencies = [ dependencies = [
"cargo_metadata", "cargo_metadata",
"difference", "difference",
@ -1280,7 +1280,7 @@ dependencies = [
"ra_ide", "ra_ide",
"ra_ide_db", "ra_ide_db",
"ra_mbe", "ra_mbe",
"ra_proc_macro_srv", "proc_macro_srv",
"ra_project_model", "ra_project_model",
"ra_ssr", "ra_ssr",
"rayon", "rayon",

9
crates/ra_proc_macro_srv/Cargo.toml → crates/proc_macro_srv/Cargo.toml
View file

@ -1,10 +1,9 @@
[package] [package]
edition = "2018" name = "proc_macro_srv"
name = "ra_proc_macro_srv" version = "0.0.0"
version = "0.1.0"
authors = ["rust-analyzer developers"]
publish = false
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
authors = ["rust-analyzer developers"]
edition = "2018"
[lib] [lib]
doctest = false doctest = false

0
crates/ra_proc_macro_srv/src/cli.rs → crates/proc_macro_srv/src/cli.rs
View file

0
crates/ra_proc_macro_srv/src/dylib.rs → crates/proc_macro_srv/src/dylib.rs
View file

0
crates/ra_proc_macro_srv/src/lib.rs → crates/proc_macro_srv/src/lib.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/bridge/buffer.rs → crates/proc_macro_srv/src/proc_macro/bridge/buffer.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs → crates/proc_macro_srv/src/proc_macro/bridge/client.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs → crates/proc_macro_srv/src/proc_macro/bridge/closure.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/bridge/handle.rs → crates/proc_macro_srv/src/proc_macro/bridge/handle.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs → crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/bridge/rpc.rs → crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs → crates/proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/bridge/server.rs → crates/proc_macro_srv/src/proc_macro/bridge/server.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/diagnostic.rs → crates/proc_macro_srv/src/proc_macro/diagnostic.rs
View file

0
crates/ra_proc_macro_srv/src/proc_macro/mod.rs → crates/proc_macro_srv/src/proc_macro/mod.rs
View file

0
crates/ra_proc_macro_srv/src/rustc_server.rs → crates/proc_macro_srv/src/rustc_server.rs
View file

0
crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt → crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt vendored
View file

0
crates/ra_proc_macro_srv/src/tests/mod.rs → crates/proc_macro_srv/src/tests/mod.rs
View file

0
crates/ra_proc_macro_srv/src/tests/utils.rs → crates/proc_macro_srv/src/tests/utils.rs
View file

2
crates/rust-analyzer/Cargo.toml
View file

@ -52,7 +52,7 @@ ra_ssr = { path = "../ra_ssr" }
hir = { path = "../ra_hir", package = "ra_hir" } hir = { path = "../ra_hir", package = "ra_hir" }
hir_def = { path = "../ra_hir_def", package = "ra_hir_def" } hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" } 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] [target.'cfg(windows)'.dependencies]
winapi = "0.3.8" winapi = "0.3.8"

2
crates/rust-analyzer/src/bin/main.rs
View file

@ -30,7 +30,7 @@ fn try_main() -> Result<()> {
let args = args::Args::parse()?; let args = args::Args::parse()?;
match args.command { match args.command {
args::Command::RunServer => run_server()?, 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::Parse { no_dump } => cli::parse(no_dump)?,
args::Command::Symbols => cli::symbols()?, args::Command::Symbols => cli::symbols()?,

2
crates/rust-analyzer/src/reload.rs
View file

@ -176,7 +176,7 @@ impl GlobalState {
Ok(it) => it, Ok(it) => it,
Err(err) => { Err(err) => {
log::error!( log::error!(
"Failed to run ra_proc_macro_srv from path {}, error: {:?}", "Failed to run proc_macro_srv from path {}, error: {:?}",
path.display(), path.display(),
err err
); );