- [ ] Rebase once the beta is out - [ ] Verify https://github.com/rust-lang/rust/pull/160820 works/is correct on r9x - [ ] Go through commits and squash later fixes to the same areas as earlier ones