Auto merge of #13253 - Veykril:simplify, r=Veykril

Simplify
This commit is contained in:
bors 2022-09-18 17:52:21 +00:00
commit 39eaf7864c

View File

@ -18,7 +18,7 @@ use crate::{
ConstId, HasModule, ImplId, LocalModuleId, MacroId, ModuleDefId, ModuleId, TraitId,
};
#[derive(Copy, Clone)]
#[derive(Copy, Clone, Debug)]
pub(crate) enum ImportType {
Glob,
Named,
@ -302,14 +302,14 @@ impl ItemScope {
$changed = true;
}
Entry::Occupied(mut entry)
if $glob_imports.$field.contains(&$lookup)
&& matches!($def_import_type, ImportType::Named) =>
if matches!($def_import_type, ImportType::Named) =>
{
if $glob_imports.$field.remove(&$lookup) {
cov_mark::hit!(import_shadowed);
$glob_imports.$field.remove(&$lookup);
entry.insert(fld);
$changed = true;
}
}
_ => {}
}
}