Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-expand/src/db.rs')
| -rw-r--r-- | crates/hir-expand/src/db.rs | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/crates/hir-expand/src/db.rs b/crates/hir-expand/src/db.rs index 5c9520d397..c0a73369a6 100644 --- a/crates/hir-expand/src/db.rs +++ b/crates/hir-expand/src/db.rs @@ -1,13 +1,12 @@ //! Defines database & queries for macro expansion. use base_db::{Crate, SourceDatabase}; -use span::Span; use syntax::ast; use crate::{ AstId, BuiltinAttrExpander, BuiltinDeriveExpander, BuiltinFnLikeExpander, EagerExpander, - EditionedFileId, FileRange, HirFileId, MacroDefId, MacroDefKind, - declarative::DeclarativeMacroExpander, proc_macro::CustomProcMacroExpander, + MacroDefId, MacroDefKind, declarative::DeclarativeMacroExpander, + proc_macro::CustomProcMacroExpander, }; #[derive(Debug, Clone, Copy, Eq, PartialEq)] @@ -29,9 +28,6 @@ pub enum TokenExpander<'db> { #[query_group::query_group] pub trait ExpandDatabase: SourceDatabase { - #[salsa::transparent] - fn resolve_span(&self, span: Span) -> FileRange; - /// Fetches the expander for this macro. #[salsa::transparent] #[salsa::invoke(TokenExpander::macro_expander)] @@ -47,13 +43,6 @@ pub trait ExpandDatabase: SourceDatabase { ) -> &DeclarativeMacroExpander; } -fn resolve_span(db: &dyn ExpandDatabase, Span { range, anchor, ctx: _ }: Span) -> FileRange { - let file_id = EditionedFileId::from_span_file_id(db, anchor.file_id); - let anchor_offset = - HirFileId::from(file_id).ast_id_map(db).get_erased(anchor.ast_id).text_range().start(); - FileRange { file_id, range: range + anchor_offset } -} - impl<'db> TokenExpander<'db> { fn macro_expander(db: &'db dyn ExpandDatabase, id: MacroDefId) -> TokenExpander<'db> { match id.kind { |