Rebase the 1.0-staging branch on main

[notgull]

I'm doing some work there and I'd like to get the latest fixes for Nightly Rust

[notgull]

@sunfishcode Any chance you can take care of this?

[sunfishcode]

I've now rebased the 1.0-staging branch on main.

[notgull]

Thanks!