Auto merge of #41464 - frewsxcv:rollup, r=frewsxcv

Rollup of 3 pull requests

- Successful merges: #41077, #41355, #41450
- Failed merges:

diff --cc src/librustc/ty/mod.rs
Simple merge

diff --cc src/librustc_trans/mir/mod.rs
Simple merge