Rollup merge of #151773 - dianne:cleanup-division-promotion, r=oli-obk

clean up checks for constant promotion of integer division/remainder operations

I found the old logic with matches on `Option`s returned by other matches to be kind of complicated, so I rewrote it with `let` chains. There should be no change in behavior.

Author: JonathanBrouwer