Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-def/src/nameres/collector.rs')
-rw-r--r--crates/hir-def/src/nameres/collector.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/crates/hir-def/src/nameres/collector.rs b/crates/hir-def/src/nameres/collector.rs
index 2d4586146d..659e7ed503 100644
--- a/crates/hir-def/src/nameres/collector.rs
+++ b/crates/hir-def/src/nameres/collector.rs
@@ -5,6 +5,7 @@
use std::{cmp::Ordering, iter, mem};
+use ::tt::Span;
use base_db::{CrateId, Dependency, Edition, FileId};
use cfg::{CfgExpr, CfgOptions};
use either::Either;
@@ -85,8 +86,7 @@ pub(super) fn collect_defs(db: &dyn DefDatabase, def_map: DefMap, tree_id: TreeI
.enumerate()
.map(|(idx, it)| {
// FIXME: a hacky way to create a Name from string.
- let name =
- tt::Ident { text: it.name.clone(), span: tt::TokenId::unspecified() };
+ let name = tt::Ident { text: it.name.clone(), span: tt::SpanData::DUMMY };
(name.as_name(), ProcMacroExpander::new(base_db::ProcMacroId(idx as u32)))
})
.collect())
@@ -471,7 +471,7 @@ impl DefCollector<'_> {
directive.module_id,
MacroCallKind::Attr {
ast_id: ast_id.ast_id,
- attr_args: Arc::new((tt::Subtree::empty(), Default::default())),
+ attr_args: Arc::new(tt::Subtree::empty()),
invoc_attr_index: attr.id,
},
attr.path().clone(),
@@ -2083,8 +2083,7 @@ impl ModCollector<'_, '_> {
let name = match attrs.by_key("rustc_builtin_macro").string_value() {
Some(it) => {
// FIXME: a hacky way to create a Name from string.
- name =
- tt::Ident { text: it.clone(), span: tt::TokenId::unspecified() }.as_name();
+ name = tt::Ident { text: it.clone(), span: tt::SpanData::DUMMY }.as_name();
&name
}
None => {