Merge pull request #5738 from matklad/cfg

Rename ra_cfg -> cfg

2 files changed, 6 insertions, 4 deletions

diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index 775af890e..0954ffb66 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -9,12 +9,13 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-tt = { path = "../tt" }
-ra_mbe = { path = "../ra_mbe" }
-ra_proc_macro = { path = "../ra_proc_macro" }
 goblin = "0.2.1"
 libloading = "0.6.0"
 memmap = "0.7"
+
+tt = { path = "../tt" }
+mbe = { path = "../mbe" }
+ra_proc_macro = { path = "../ra_proc_macro" }
 test_utils = { path = "../test_utils" }
 
 [dev-dependencies]
@@ -22,4 +23,5 @@ cargo_metadata = "0.11.1"
 difference = "2.0.0"
 # used as proc macro test target
 serde_derive = "1.0.106"
+
 toolchain = { path = "../toolchain" }
diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs
index d534d1337..7d1695c86 100644
--- a/crates/proc_macro_srv/src/rustc_server.rs
+++ b/crates/proc_macro_srv/src/rustc_server.rs
@@ -182,7 +182,7 @@ pub mod token_stream {
 
         fn from_str(src: &str) -> Result<TokenStream, LexError> {
             let (subtree, _token_map) =
-                ra_mbe::parse_to_token_tree(src).ok_or("Failed to parse from mbe")?;
+                mbe::parse_to_token_tree(src).ok_or("Failed to parse from mbe")?;
 
             let tt: tt::TokenTree = subtree.into();
             Ok(tt.into())