manual_unwrap_or: fix FP edge case#15812

notriddle wants to merge 2 commits intorust-lang:masterrust-lang/rust-clippy:masterfrom

notriddle:manual-unwrap-or-edge-casenotriddle/rust-clippy:manual-unwrap-or-edge-caseCopy head branch name to clipboard