2325c20925
These are changes that would be needed if we add `#[must_use]` to `Option::map`, per #71484.
These are changes that would be needed if we add `#[must_use]` to `Option::map`, per #71484.