Split out rustc_parse_format from rustc_dependencies

Author: Veykril

Cargo.lock

@@ -80,7 +80,8 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 rustc-dependencies = { path = "./crates/rustc-dependencies", version = "0.0.0" }
 
-ra-ap-rustc_lexer = "0.21.0"
+ra-ap-rustc_lexer = { version = "0.21.0", default-features = false }
+ra-ap-rustc_parse_format = { version = "0.21.0", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 sourcegen = { path = "./crates/sourcegen" }

Cargo.toml

@@ -29,6 +29,7 @@ smallvec.workspace = true
 hashbrown.workspace = true
 triomphe.workspace = true
 
+ra-ap-rustc_parse_format.workspace = true
 rustc-dependencies.workspace = true
 
 # local deps
@@ -56,4 +57,4 @@ test-fixture.workspace = true
 in-rust-tree = ["rustc-dependencies/in-rust-tree"]
 
 [lints]
-workspace = true
+workspace = true

crates/hir-def/Cargo.toml

@@ -2,7 +2,7 @@
 use std::mem;
 
 use hir_expand::name::Name;
-use rustc_dependencies::parse_format as parse;
+use rustc_parse_format as parse;
 use stdx::TupleExt;
 use syntax::{
     ast::{self, IsString},

crates/hir-def/src/hir/format_args.rs

@@ -10,10 +10,11 @@
 #![warn(rust_2018_idioms, unused_lifetimes)]
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 
-#[allow(unused)]
-macro_rules! eprintln {
-    ($($tt:tt)*) => { stdx::eprintln!($($tt)*) };
-}
+#[cfg(feature = "in-rust-tree")]
+extern crate rustc_parse_format;
+
+#[cfg(not(feature = "in-rust-tree"))]
+extern crate ra_ap_rustc_parse_format as rustc_parse_format;
 
 pub mod db;
 

crates/hir-def/src/lib.rs

@@ -11,7 +11,6 @@ authors.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ra-ap-rustc_parse_format = { version = "0.21.0", default-features = false }
 ra-ap-rustc_index = { version = "0.21.0", default-features = false }
 ra-ap-rustc_abi = { version = "0.21.0", default-features = false }
 

crates/rustc-dependencies/Cargo.toml

@@ -3,17 +3,6 @@
 
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_parse_format;
-
-pub mod parse_format {
-    #[cfg(not(feature = "in-rust-tree"))]
-    pub use ::ra_ap_rustc_parse_format::*;
-
-    #[cfg(feature = "in-rust-tree")]
-    pub use ::rustc_parse_format::*;
-}
-
 #[cfg(feature = "in-rust-tree")]
 extern crate rustc_abi;