Skip to content

Commit d3f4c8f

Browse files
committed
Use unwrap_or_else for OptionalArg in dictionary.
1 parent 4f0b17e commit d3f4c8f

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

vm/src/obj/objdict.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,7 @@ impl PyDictRef {
222222
) -> PyResult {
223223
match self.entries.borrow().get(vm, &key)? {
224224
Some(value) => Ok(value),
225-
None => match default {
226-
OptionalArg::Present(value) => Ok(value),
227-
OptionalArg::Missing => Ok(vm.ctx.none()),
228-
},
225+
None => Ok(default.unwrap_or_else(|| vm.ctx.none())),
229226
}
230227
}
231228

@@ -239,10 +236,7 @@ impl PyDictRef {
239236
match entries.get(vm, &key)? {
240237
Some(value) => Ok(value),
241238
None => {
242-
let set_value = match default {
243-
OptionalArg::Present(value) => value,
244-
OptionalArg::Missing => vm.ctx.none(),
245-
};
239+
let set_value = default.unwrap_or_else(|| vm.ctx.none());
246240
entries.insert(vm, &key, set_value.clone())?;
247241
Ok(set_value)
248242
}

0 commit comments

Comments
 (0)