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

Remove code duplication

Browse source
This commit is contained in:
Aleksey Kladov 2020-04-11 17:18:42 +02:00
parent b8eb1597c9
commit 55356332bf
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/ra_hir_def/src/attr.rs
View file

@ -93,6 +93,7 @@ impl Attrs {
} }
pub(crate) fn is_cfg_enabled(&self, cfg_options: &CfgOptions) -> bool { pub(crate) fn is_cfg_enabled(&self, cfg_options: &CfgOptions) -> bool {
// FIXME: handle cfg_attr :-)
self.by_key("cfg").tt_values().all(|tt| cfg_options.is_cfg_enabled(tt) != Some(false)) self.by_key("cfg").tt_values().all(|tt| cfg_options.is_cfg_enabled(tt) != Some(false))
} }
} }

6
crates/ra_hir_def/src/nameres/collector.rs
View file

@ -977,11 +977,7 @@ impl ModCollector<'_, '_> {
} }
fn is_cfg_enabled(&self, attrs: &Attrs) -> bool { fn is_cfg_enabled(&self, attrs: &Attrs) -> bool {
// FIXME: handle cfg_attr :-) attrs.is_cfg_enabled(self.def_collector.cfg_options)
attrs
.by_key("cfg")
.tt_values()
.all(|tt| self.def_collector.cfg_options.is_cfg_enabled(tt) != Some(false))
} }
} }