Resolve merge conflicts with #10330#10386
Conversation
This makes the specific kinds to use for build-std available.
`build-std` now works with no `--target` specified to either use defaulted target or host target.
This makes the specific kinds to use for build-std available.
`build-std` now works with no `--target` specified to either use defaulted target or host target.
|
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. |
rust-highfive
added
the
S-waiting-on-review
|
Added a couple of line comments to denote the changes made by @fee1-dead that are critical here. |
|
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. |
|
☔ The latest upstream changes (presumably #9992) made this pull request unmergeable. Please resolve the merge conflicts. |
|
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. |
|
I'm going to close this as I don't really know what this is for or why it was submitted. |
6 participants
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.