Fix #6061 : Revert commits to fix bootstrapping issue 6061 #6062
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have confirmed that reverting these two commits gets me bootstrapping again (or rather, my build finishes without erroring out during the first 1/3 of the build).
I don't know yet why these changes exposed this problem; obviously that requires investigation. But I figured it was best to try to get the build working again (and also to advertise this revert to other people who have been encountering similar problems according to the #rust channel and find out if it fixes things for them too -- so even if this pull request doesn't land, I figure I should issue it just as advertisement.)