Clippy: Use ok_or_else, or_insert_with
Clippy: Use ok_or_else, or_insert_with

ref.
https://rust-lang.github.io/rust-clippy/master/index.html#or_fun_call

Signed-off-by: Tony Asleson <a9f43b963cc2eaa0404961bf897f77a26737fc58@gmail.com>

agrover/melvin