Use `map_or` instead of open-coding it#86407

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

LingMan:map-orLingMan/rust:map-orCopy head branch name to clipboard