diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2022-07-21 16:05:52 +0200 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2022-07-22 22:17:13 +0200 |
| commit | 0081ef383489679e491d99a1978ded16e06906d3 (patch) | |
| tree | dfeac335def979d885b995c852a5a376ee1d1e46 /crates/hir-def/src/nameres.rs | |
| parent | 5f9a5825e0755fe3072679bb6ca59bf3672be343 (diff) | |
| download | rust-0081ef383489679e491d99a1978ded16e06906d3.tar.gz rust-0081ef383489679e491d99a1978ded16e06906d3.zip | |
Use ItemTree for modules in attrs_query
Diffstat (limited to 'crates/hir-def/src/nameres.rs')
| -rw-r--r-- | crates/hir-def/src/nameres.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crates/hir-def/src/nameres.rs b/crates/hir-def/src/nameres.rs index a32513cf65b..c67046dfdab 100644 --- a/crates/hir-def/src/nameres.rs +++ b/crates/hir-def/src/nameres.rs @@ -70,7 +70,7 @@ use syntax::{ast, SmolStr}; use crate::{ db::DefDatabase, item_scope::{BuiltinShadowMode, ItemScope}, - item_tree::TreeId, + item_tree::{ItemTreeId, Mod, TreeId}, nameres::{diagnostics::DefDiagnostic, path_resolution::ResolveMode}, path::ModPath, per_ns::PerNs, @@ -141,9 +141,11 @@ pub enum ModuleOrigin { File { is_mod_rs: bool, declaration: AstId<ast::Module>, + declaration_tree_id: ItemTreeId<Mod>, definition: FileId, }, Inline { + definition_tree_id: ItemTreeId<Mod>, definition: AstId<ast::Module>, }, /// Pseudo-module introduced by a block scope (contains only inner items). @@ -186,7 +188,7 @@ impl ModuleOrigin { let sf = db.parse(file_id).tree(); InFile::new(file_id.into(), ModuleSource::SourceFile(sf)) } - ModuleOrigin::Inline { definition } => InFile::new( + ModuleOrigin::Inline { definition, .. } => InFile::new( definition.file_id, ModuleSource::Module(definition.to_node(db.upcast())), ), |
