Skip to content

Commit a80e8fe

Browse files
author
Jonas Schievink
committed
Simplify entry API usage
1 parent 56fb8a4 commit a80e8fe

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

crates/ra_hir_def/src/item_scope.rs

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -158,31 +158,22 @@ impl ItemScope {
158158
let mut changed = false;
159159

160160
if let Some(types) = def.types {
161-
match self.types.entry(name.clone()) {
162-
Entry::Occupied(_) => {}
163-
Entry::Vacant(e) => {
164-
e.insert(types);
165-
changed = true;
166-
}
167-
}
161+
self.types.entry(name.clone()).or_insert_with(|| {
162+
changed = true;
163+
types
164+
});
168165
}
169166
if let Some(values) = def.values {
170-
match self.values.entry(name.clone()) {
171-
Entry::Occupied(_) => {}
172-
Entry::Vacant(e) => {
173-
e.insert(values);
174-
changed = true;
175-
}
176-
}
167+
self.values.entry(name.clone()).or_insert_with(|| {
168+
changed = true;
169+
values
170+
});
177171
}
178172
if let Some(macros) = def.macros {
179-
match self.macros.entry(name.clone()) {
180-
Entry::Occupied(_) => {}
181-
Entry::Vacant(e) => {
182-
e.insert(macros);
183-
changed = true;
184-
}
185-
}
173+
self.macros.entry(name.clone()).or_insert_with(|| {
174+
changed = true;
175+
macros
176+
});
186177
}
187178

188179
if def.is_none() {

0 commit comments

Comments
 (0)