Current status:

• CI passes on an earlier version of this patch, the only difference to the current patch is that it had broad #[allow(dead_code)] annotations instead of tightly-scoped #[expect(dead_code)] annotations

• The build succeeds on my machine with the current patch

So this is ready for review

Fixed the test failures I originally had in a better way, and removed the commits which were superceded by other commits. ./x test bootstrap passes locally

Accepted both suggestions

bors merge

🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

Build succeeded:

• full
• setup