bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-def/src/src.rs')
-rw-r--r--crates/hir-def/src/src.rs13
1 files changed, 5 insertions, 8 deletions
diff --git a/crates/hir-def/src/src.rs b/crates/hir-def/src/src.rs
index 367b543cf9..6fe016f1e6 100644
--- a/crates/hir-def/src/src.rs
+++ b/crates/hir-def/src/src.rs
@@ -7,7 +7,7 @@ use syntax::{AstNode, AstPtr, ast};
use crate::{
AstIdLoc, GenericDefId, LocalFieldId, LocalLifetimeParamId, LocalTypeOrConstParamId, Lookup,
- UseId, VariantId, attr::Attrs, db::DefDatabase,
+ UseId, VariantId, attrs::AttrFlags, db::DefDatabase,
};
pub trait HasSource {
@@ -145,15 +145,13 @@ impl HasChildSource<LocalFieldId> for VariantId {
(lookup.source(db).map(|it| it.kind()), lookup.container)
}
};
- let span_map = db.span_map(src.file_id);
let mut map = ArenaMap::new();
match &src.value {
ast::StructKind::Tuple(fl) => {
- let cfg_options = container.krate.cfg_options(db);
+ let cfg_options = container.krate(db).cfg_options(db);
let mut idx = 0;
for fd in fl.fields() {
- let enabled =
- Attrs::is_cfg_enabled_for(db, &fd, span_map.as_ref(), cfg_options).is_ok();
+ let enabled = AttrFlags::is_cfg_enabled_for(&fd, cfg_options).is_ok();
if !enabled {
continue;
}
@@ -165,11 +163,10 @@ impl HasChildSource<LocalFieldId> for VariantId {
}
}
ast::StructKind::Record(fl) => {
- let cfg_options = container.krate.cfg_options(db);
+ let cfg_options = container.krate(db).cfg_options(db);
let mut idx = 0;
for fd in fl.fields() {
- let enabled =
- Attrs::is_cfg_enabled_for(db, &fd, span_map.as_ref(), cfg_options).is_ok();
+ let enabled = AttrFlags::is_cfg_enabled_for(&fd, cfg_options).is_ok();
if !enabled {
continue;
}