34e073f44b
Use Option::map instead of open-coding it r? ```@oli-obk``` ```@rustbot``` modify labels +C-cleanup +T-compiler