Merge pull request #21349 from ChayimFriedman2/no-generic-span

internal: Make token trees no longer generic over the span

Author: Veykril

Cargo.lock

@@ -19,6 +19,7 @@ tracing.workspace = true
 # locals deps
 tt = { workspace = true, optional = true }
 syntax = { workspace = true, optional = true }
+span = { path = "../span", version = "0.0", optional = true }
 intern.workspace = true
 
 [dev-dependencies]
@@ -35,6 +36,8 @@ cfg = { path = ".", default-features = false, features = ["tt"] }
 
 [features]
 default = []
+syntax = ["dep:syntax", "dep:span"]
+tt = ["dep:tt"]
 in-rust-tree = []
 
 [lints]

crates/cfg/Cargo.toml

@@ -96,12 +96,12 @@ impl CfgExpr {
     // FIXME: Parsing from `tt` is only used in a handful of places, reconsider
     // if we should switch them to AST.
     #[cfg(feature = "tt")]
-    pub fn parse<S: Copy>(tt: &tt::TopSubtree<S>) -> CfgExpr {
+    pub fn parse(tt: &tt::TopSubtree) -> CfgExpr {
         next_cfg_expr(&mut tt.iter()).unwrap_or(CfgExpr::Invalid)
     }
 
     #[cfg(feature = "tt")]
-    pub fn parse_from_iter<S: Copy>(tt: &mut tt::iter::TtIter<'_, S>) -> CfgExpr {
+    pub fn parse_from_iter(tt: &mut tt::iter::TtIter<'_>) -> CfgExpr {
         next_cfg_expr(tt).unwrap_or(CfgExpr::Invalid)
     }
 
@@ -149,7 +149,15 @@ fn next_cfg_expr_from_ast(
             if let Some(NodeOrToken::Token(literal)) = it.peek()
                 && matches!(literal.kind(), SyntaxKind::STRING)
             {
-                let literal = tt::token_to_literal(literal.text(), ()).symbol;
+                let dummy_span = span::Span {
+                    range: span::TextRange::empty(span::TextSize::new(0)),
+                    anchor: span::SpanAnchor {
+                        file_id: span::EditionedFileId::from_raw(0),
+                        ast_id: span::FIXUP_ERASED_FILE_AST_ID_MARKER,
+                    },
+                    ctx: span::SyntaxContext::root(span::Edition::Edition2015),
+                };
+                let literal = tt::token_to_literal(literal.text(), dummy_span).symbol;
                 it.next();
                 CfgAtom::KeyValue { key: name, value: literal.clone() }.into()
             } else {
@@ -179,7 +187,7 @@ fn next_cfg_expr_from_ast(
 }
 
 #[cfg(feature = "tt")]
-fn next_cfg_expr<S: Copy>(it: &mut tt::iter::TtIter<'_, S>) -> Option<CfgExpr> {
+fn next_cfg_expr(it: &mut tt::iter::TtIter<'_>) -> Option<CfgExpr> {
     use intern::sym;
     use tt::iter::TtElement;
 

crates/cfg/src/cfg_expr.rs

@@ -103,7 +103,7 @@ fn lower_extra_crate_attrs<'a>(
     struct FakeSpanMap {
         file_id: span::EditionedFileId,
     }
-    impl syntax_bridge::SpanMapper<Span> for FakeSpanMap {
+    impl syntax_bridge::SpanMapper for FakeSpanMap {
         fn span_for(&self, range: TextRange) -> Span {
             Span {
                 range,

crates/hir-def/src/item_tree.rs

@@ -18,7 +18,6 @@ use hir_expand::{
     name::Name,
 };
 use intern::{Interned, Symbol, sym};
-use span::Span;
 use syntax::{AstNode, T, ast};
 use syntax_bridge::DocCommentDesugarMode;
 use tt::token_to_literal;
@@ -49,7 +48,7 @@ impl AttrsOrCfg {
         span_map: S,
     ) -> AttrsOrCfg
     where
-        S: syntax_bridge::SpanMapper<Span> + Copy,
+        S: syntax_bridge::SpanMapper + Copy,
     {
         let mut attrs = Vec::new();
         let result =

crates/hir-def/src/item_tree/attrs.rs

@@ -5,7 +5,7 @@ use intern::sym;
 use itertools::{Itertools, izip};
 use parser::SyntaxKind;
 use rustc_hash::FxHashSet;
-use span::{Edition, Span, SyntaxContext};
+use span::{Edition, Span};
 use stdx::never;
 use syntax_bridge::DocCommentDesugarMode;
 use tracing::debug;
@@ -238,7 +238,7 @@ fn parse_adt(
 
 fn parse_adt_from_syntax(
     adt: &ast::Adt,
-    tm: &span::SpanMap<SyntaxContext>,
+    tm: &span::SpanMap,
     call_site: Span,
 ) -> Result<BasicAdtInfo, ExpandError> {
     let (name, generic_param_list, where_clause, shape) = match &adt {
@@ -390,7 +390,7 @@ fn to_adt_syntax(
     db: &dyn ExpandDatabase,
     tt: &tt::TopSubtree,
     call_site: Span,
-) -> Result<(ast::Adt, span::SpanMap<SyntaxContext>), ExpandError> {
+) -> Result<(ast::Adt, span::SpanMap), ExpandError> {
     let (parsed, tm) = crate::db::token_tree_to_syntax_node(db, tt, crate::ExpandTo::Items);
     let macro_items = ast::MacroItems::cast(parsed.syntax_node())
         .ok_or_else(|| ExpandError::other(call_site, "invalid item definition"))?;

crates/hir-expand/src/builtin/derive_macro.rs

@@ -8,7 +8,7 @@ use tt::IdentIsRaw;
 
 use crate::{name::Name, tt::TopSubtreeBuilder};
 
-pub(crate) fn dollar_crate(span: Span) -> tt::Ident<Span> {
+pub(crate) fn dollar_crate(span: Span) -> tt::Ident {
     tt::Ident { sym: sym::dollar_crate, span, is_raw: tt::IdentIsRaw::No }
 }
 

crates/hir-expand/src/builtin/quote.rs

@@ -66,25 +66,7 @@ pub use crate::{
 pub use base_db::EditionedFileId;
 pub use mbe::{DeclarativeMacro, MacroCallStyle, MacroCallStyles, ValueResult};
 
-pub mod tt {
-    pub use span::Span;
-    pub use tt::{DelimiterKind, IdentIsRaw, LitKind, Spacing, token_to_literal};
-
-    pub type Delimiter = ::tt::Delimiter<Span>;
-    pub type DelimSpan = ::tt::DelimSpan<Span>;
-    pub type Subtree = ::tt::Subtree<Span>;
-    pub type Leaf = ::tt::Leaf<Span>;
-    pub type Literal = ::tt::Literal<Span>;
-    pub type Punct = ::tt::Punct<Span>;
-    pub type Ident = ::tt::Ident<Span>;
-    pub type TokenTree = ::tt::TokenTree<Span>;
-    pub type TopSubtree = ::tt::TopSubtree<Span>;
-    pub type TopSubtreeBuilder = ::tt::TopSubtreeBuilder<Span>;
-    pub type TokenTreesView<'a> = ::tt::TokenTreesView<'a, Span>;
-    pub type SubtreeView<'a> = ::tt::SubtreeView<'a, Span>;
-    pub type TtElement<'a> = ::tt::iter::TtElement<'a, Span>;
-    pub type TtIter<'a> = ::tt::iter::TtIter<'a, Span>;
-}
+pub use tt;
 
 #[macro_export]
 macro_rules! impl_intern_lookup {

crates/hir-expand/src/lib.rs

@@ -258,7 +258,7 @@ impl AsName for ast::NameOrNameRef {
     }
 }
 
-impl<Span> AsName for tt::Ident<Span> {
+impl AsName for tt::Ident {
     fn as_name(&self) -> Name {
         Name::new_root(self.sym.as_str())
     }

crates/hir-expand/src/name.rs

@@ -1,14 +1,14 @@
 //! Span maps for real files and macro expansions.
 
-use span::{Span, SyntaxContext};
+use span::Span;
 use syntax::{AstNode, TextRange, ast};
 use triomphe::Arc;
 
 pub use span::RealSpanMap;
 
 use crate::{HirFileId, MacroCallId, db::ExpandDatabase};
 
-pub type ExpansionSpanMap = span::SpanMap<SyntaxContext>;
+pub type ExpansionSpanMap = span::SpanMap;
 
 /// Spanmap for a macro file or a real file
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -27,13 +27,13 @@ pub enum SpanMapRef<'a> {
     RealSpanMap(&'a RealSpanMap),
 }
 
-impl syntax_bridge::SpanMapper<Span> for SpanMap {
+impl syntax_bridge::SpanMapper for SpanMap {
     fn span_for(&self, range: TextRange) -> Span {
         self.span_for_range(range)
     }
 }
 
-impl syntax_bridge::SpanMapper<Span> for SpanMapRef<'_> {
+impl syntax_bridge::SpanMapper for SpanMapRef<'_> {
     fn span_for(&self, range: TextRange) -> Span {
         self.span_for_range(range)
     }