Resolve merge conflicts with #10330

[kennystrawnmusic]

Forked @fee1-dead's fork in order to update and rebase the changes. Should resolve the conflicts that reared their ugly heads since #10330 was submitted.

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

Please see the contribution instructions for more information.

[kennystrawnmusic]

Added a couple of line comments to denote the changes made by @fee1-dead that are critical here.

[alexcrichton]

I'm confused as to the purpose of this because #10330 doesn't have any merge conflicts and is actively blocked on this concern, not merge conflicts.

[bors]

☔ The latest upstream changes (presumably #9992) made this pull request unmergeable. Please resolve the merge conflicts.

[alexcrichton]

Thanks for the PR, but I'm going to be stepping down from the Cargo team so I'm going to un-assign myself from this. The Cargo team will help review this when they get a chance.

[ehuss]

I'm going to close this as I don't really know what this is for or why it was submitted.