Fix option_if_let_else#7573

bors merged 2 commits intorust-lang:masterrust-lang/rust-clippy:masterfrom

Jarcho:option_if_let_elseJarcho/rust-clippy:option_if_let_elseCopy head branch name to clipboard