Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 14:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify

Browse source
This commit is contained in:
Lukas Wirth 2022-07-21 02:06:26 +02:00
parent c83f14a44a
commit 7bd2e305d6
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/hir-def/src/body/lower.rs
View file

@ -5,7 +5,7 @@ use std::{mem, sync::Arc};
use either::Either; use either::Either;
use hir_expand::{ use hir_expand::{
ast_id_map::{AstIdMap, FileAstId}, ast_id_map::AstIdMap,
hygiene::Hygiene, hygiene::Hygiene,
name::{name, AsName, Name}, name::{name, AsName, Name},
AstId, ExpandError, HirFileId, InFile, AstId, ExpandError, HirFileId, InFile,
@ -62,22 +62,14 @@ impl<'a> LowerCtx<'a> {
&self.hygiene &self.hygiene
} }
pub(crate) fn file_id(&self) -> HirFileId {
self.ast_id_map.as_ref().unwrap().0
}
pub(crate) fn lower_path(&self, ast: ast::Path) -> Option<Path> { pub(crate) fn lower_path(&self, ast: ast::Path) -> Option<Path> {
Path::from_src(ast, self) Path::from_src(ast, self)
} }
pub(crate) fn ast_id<N: AstNode>( pub(crate) fn ast_id<N: AstNode>(&self, db: &dyn DefDatabase, item: &N) -> Option<AstId<N>> {
&self, let &(file_id, ref ast_id_map) = self.ast_id_map.as_ref()?;
db: &dyn DefDatabase, let ast_id_map = ast_id_map.get_or_init(|| db.ast_id_map(file_id));
item: &N, Some(InFile::new(file_id, ast_id_map.ast_id(item)))
) -> Option<FileAstId<N>> {
let (file_id, ast_id_map) = self.ast_id_map.as_ref()?;
let ast_id_map = ast_id_map.get_or_init(|| db.ast_id_map(*file_id));
Some(ast_id_map.ast_id(item))
} }
} }

7
crates/hir-def/src/type_ref.rs
View file

@ -5,7 +5,7 @@ use std::fmt::Write;
use hir_expand::{ use hir_expand::{
name::{AsName, Name}, name::{AsName, Name},
AstId, InFile, AstId,
}; };
use syntax::ast::{self, HasName}; use syntax::ast::{self, HasName};
@ -236,10 +236,7 @@ impl TypeRef {
TypeRef::DynTrait(type_bounds_from_ast(ctx, inner.type_bound_list())) TypeRef::DynTrait(type_bounds_from_ast(ctx, inner.type_bound_list()))
} }
ast::Type::MacroType(mt) => match mt.macro_call() { ast::Type::MacroType(mt) => match mt.macro_call() {
Some(mc) => ctx Some(mc) => ctx.ast_id(ctx.db, &mc).map(TypeRef::Macro).unwrap_or(TypeRef::Error),
.ast_id(ctx.db, &mc)
.map(|mc| TypeRef::Macro(InFile::new(ctx.file_id(), mc)))
.unwrap_or(TypeRef::Error),
None => TypeRef::Error, None => TypeRef::Error,
}, },
} }