bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Clean up convoluted macros_only logic

Browse source
This commit is contained in:
Dániel Buga 2021-01-03 12:47:38 +01:00
parent e821a6ef78
commit 675059a9eb
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_metadata/src/rmeta/decoder.rs
View file

@ -1055,19 +1055,15 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
// Iterate over all children. // Iterate over all children.
let macros_only = self.dep_kind.lock().macros_only(); let macros_only = self.dep_kind.lock().macros_only();
if !macros_only {
let children = self.root.tables.children.get(self, id).unwrap_or_else(Lazy::empty); let children = self.root.tables.children.get(self, id).unwrap_or_else(Lazy::empty);
for child_index in children.decode((self, sess)) {
if macros_only {
continue;
}
for child_index in children.decode((self, sess)) {
// Get the item. // Get the item.
if let Some(child_kind) = self.maybe_kind(child_index) { let child_kind = match self.maybe_kind(child_index) {
match child_kind { Some(child_kind) => child_kind,
EntryKind::MacroDef(..) => {} None => continue,
_ if macros_only => continue, };
_ => {}
}
// Hand off the item to the callback. // Hand off the item to the callback.
match child_kind { match child_kind {