Simplify entry API usage

This commit is contained in:
Jonas Schievink 2020-06-30 13:54:40 +02:00
parent 56fb8a401a
commit a80e8fea85

View file

@ -158,31 +158,22 @@ impl ItemScope {
let mut changed = false;
if let Some(types) = def.types {
match self.types.entry(name.clone()) {
Entry::Occupied(_) => {}
Entry::Vacant(e) => {
e.insert(types);
self.types.entry(name.clone()).or_insert_with(|| {
changed = true;
}
}
types
});
}
if let Some(values) = def.values {
match self.values.entry(name.clone()) {
Entry::Occupied(_) => {}
Entry::Vacant(e) => {
e.insert(values);
self.values.entry(name.clone()).or_insert_with(|| {
changed = true;
}
}
values
});
}
if let Some(macros) = def.macros {
match self.macros.entry(name.clone()) {
Entry::Occupied(_) => {}
Entry::Vacant(e) => {
e.insert(macros);
self.macros.entry(name.clone()).or_insert_with(|| {
changed = true;
}
}
macros
});
}
if def.is_none() {