Simplify

Author: Veykril

crates/hir-def/Cargo.toml

@@ -27,7 +27,6 @@ tracing.workspace = true
 smallvec.workspace = true
 triomphe.workspace = true
 rustc_apfloat = "0.2.3"
-text-size.workspace = true
 salsa.workspace = true
 salsa-macros.workspace = true
 query-group.workspace = true

crates/hir-ty/Cargo.toml

@@ -16,14 +16,12 @@ doctest = false
 cov-mark = "2.0.0"
 itertools.workspace = true
 arrayvec.workspace = true
-bitflags.workspace = true
 smallvec.workspace = true
 ena = "0.14.3"
 either.workspace = true
 oorandom = "11.1.5"
 tracing.workspace = true
 rustc-hash.workspace = true
-scoped-tls = "1.0.1"
 la-arena.workspace = true
 triomphe.workspace = true
 typed-arena = "2.0.2"

crates/hir/Cargo.toml

@@ -20,7 +20,6 @@ itertools.workspace = true
 smallvec.workspace = true
 tracing.workspace = true
 triomphe.workspace = true
-indexmap.workspace = true
 
 ra-ap-rustc_type_ir.workspace = true
 

crates/ide-db/Cargo.toml

@@ -22,7 +22,6 @@ rustc-hash.workspace = true
 either.workspace = true
 itertools.workspace = true
 arrayvec.workspace = true
-indexmap.workspace = true
 memchr = "2.7.5"
 salsa.workspace = true
 salsa-macros.workspace = true

crates/proc-macro-srv/src/bridge.rs

@@ -0,0 +1,10 @@
+use proc_macro::bridge as pm_bridge;
+
+pub(crate) use pm_bridge::{DelimSpan, Diagnostic, ExpnGlobals, LitKind};
+
+pub(crate) type TokenTree<S> =
+    pm_bridge::TokenTree<crate::token_stream::TokenStream<S>, S, intern::Symbol>;
+pub(crate) type Literal<S> = pm_bridge::Literal<S, intern::Symbol>;
+pub(crate) type Group<S> = pm_bridge::Group<crate::token_stream::TokenStream<S>, S>;
+pub(crate) type Punct<S> = pm_bridge::Punct<S>;
+pub(crate) type Ident<S> = pm_bridge::Ident<S, intern::Symbol>;

crates/proc-macro-srv/src/dylib.rs

@@ -12,7 +12,8 @@ use object::Object;
 use paths::{Utf8Path, Utf8PathBuf};
 
 use crate::{
-    PanicMessage, ProcMacroKind, ProcMacroSrvSpan, dylib::proc_macros::ProcMacros, tt::TokenStream,
+    PanicMessage, ProcMacroKind, ProcMacroSrvSpan, dylib::proc_macros::ProcMacros,
+    token_stream::TokenStream,
 };
 
 pub(crate) struct Expander {

crates/proc-macro-srv/src/dylib/proc_macros.rs

@@ -2,7 +2,7 @@
 
 use proc_macro::bridge;
 
-use crate::{ProcMacroKind, ProcMacroSrvSpan, tt::TokenStream};
+use crate::{ProcMacroKind, ProcMacroSrvSpan, token_stream::TokenStream};
 
 #[repr(transparent)]
 pub(crate) struct ProcMacros([bridge::client::ProcMacro]);

crates/proc-macro-srv/src/dylib/version.rs

@@ -5,11 +5,14 @@ use std::io::{self, Read};
 use object::read::{Object, ObjectSection};
 
 #[derive(Debug)]
-#[allow(dead_code)]
 pub struct RustCInfo {
+    #[allow(dead_code)]
     pub version: (usize, usize, usize),
+    #[allow(dead_code)]
     pub channel: String,
+    #[allow(dead_code)]
     pub commit: Option<String>,
+    #[allow(dead_code)]
     pub date: Option<String>,
     // something like "rustc 1.58.1 (db9d1b20b 2022-01-20)"
     pub version_string: String,

crates/proc-macro-srv/src/lib.rs

@@ -26,9 +26,10 @@ extern crate ra_ap_rustc_lexer as rustc_lexer;
 #[cfg(feature = "in-rust-tree")]
 extern crate rustc_lexer;
 
+mod bridge;
 mod dylib;
 mod server_impl;
-mod tt;
+mod token_stream;
 
 use std::{
     collections::{HashMap, hash_map::Entry},
@@ -80,12 +81,12 @@ impl ProcMacroSrv<'_> {
         env: &[(String, String)],
         current_dir: Option<impl AsRef<Path>>,
         macro_name: &str,
-        macro_body: tt::TokenStream<S>,
-        attribute: Option<tt::TokenStream<S>>,
+        macro_body: token_stream::TokenStream<S>,
+        attribute: Option<token_stream::TokenStream<S>>,
         def_site: S,
         call_site: S,
         mixed_site: S,
-    ) -> Result<tt::TokenStream<S>, PanicMessage> {
+    ) -> Result<token_stream::TokenStream<S>, PanicMessage> {
         let snapped_env = self.env;
         let expander = self.expander(lib.as_ref()).map_err(|err| PanicMessage {
             message: Some(format!("failed to load macro: {err}")),
@@ -149,7 +150,7 @@ impl ProcMacroSrv<'_> {
 }
 
 pub trait ProcMacroSrvSpan: Copy + Send + Sync {
-    type Server: proc_macro::bridge::server::Server<TokenStream = crate::tt::TokenStream<Self>>;
+    type Server: proc_macro::bridge::server::Server<TokenStream = crate::token_stream::TokenStream<Self>>;
     fn make_server(call_site: Self, def_site: Self, mixed_site: Self) -> Self::Server;
 }
 

crates/proc-macro-srv/src/server_impl.rs

@@ -6,13 +6,13 @@
 //! The original idea from fedochet is using proc-macro2 as backend,
 //! we use tt instead for better integration with RA.
 
-pub mod rust_analyzer_span;
-pub mod token_id;
+pub(crate) mod rust_analyzer_span;
+pub(crate) mod token_id;
 
 pub(super) fn literal_from_str<Span: Copy>(
     s: &str,
     span: Span,
-) -> Result<proc_macro::bridge::Literal<Span, intern::Symbol>, ()> {
+) -> Result<crate::bridge::Literal<Span>, ()> {
     use rustc_lexer::{LiteralKind, Token, TokenKind};
     let mut tokens = rustc_lexer::tokenize(s, rustc_lexer::FrontmatterAllowed::No);
     let minus_or_lit = tokens.next().unwrap_or(Token { kind: TokenKind::Eof, len: 0 });
@@ -35,5 +35,5 @@ pub(super) fn literal_from_str<Span: Copy>(
     }
 
     let TokenKind::Literal { kind, suffix_start } = lit.kind else { return Err(()) };
-    Ok(crate::tt::literal_from_lexer(s, span, kind, suffix_start))
+    Ok(crate::token_stream::literal_from_lexer(s, span, kind, suffix_start))
 }