-
Notifications
You must be signed in to change notification settings - Fork 13.4k
bootstap: create .cargo/config only if not present #90800
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon. Please see the contribution instructions for more information. |
9e84e79
to
2d5c62b
Compare
A couple minor nits (may need to rewrap), and please squash commits into one if you use the github UI to add suggestions -- but r=me after that. |
2d5c62b
to
74246de
Compare
This comment has been minimized.
This comment has been minimized.
In some situations we should want on influence into the .cargo/config when we use vendored source. One example is rust-lang#90764, when we want to workaround some references to crates forked and living in git, that are missing in the vendor/ directory. This commit will create the .cargo/config file only when the .cargo/ directory needs to be created.
74246de
to
afd9dfa
Compare
📌 Commit afd9dfa has been approved by |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 18, 2021
…mulacrum bootstap: create .cargo/config only if not present In some situations we should want on influence into the .cargo/config when we use vendored source. One example is rust-lang#90764, when we want to workaround some references to crates forked and living in git, that are missing in the vendor/ directory. This commit will create the .cargo/config file only when the .cargo/ directory needs to be created.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 19, 2021
Rollup of 8 pull requests Successful merges: - rust-lang#89258 (Make char conversion functions unstably const) - rust-lang#90578 (add const generics test) - rust-lang#90633 (Refactor single variant `Candidate` enum into a struct) - rust-lang#90800 (bootstap: create .cargo/config only if not present) - rust-lang#90942 (windows: Return the "Not Found" error when a path is empty) - rust-lang#90947 (Move some tests to more reasonable directories - 9.5) - rust-lang#90961 (Suggest removal of arguments for unit variant, not replacement) - rust-lang#90990 (Arenas cleanup) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Labels
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
T-infra
Relevant to the infrastructure team, which will review and decide on the PR/issue.
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.
In some situations we should want on influence into the .cargo/config
when we use vendored source. One example is #90764, when we want to
workaround some references to crates forked and living in git, that are
missing in the vendor/ directory.
This commit will create the .cargo/config file only when the .cargo/
directory needs to be created.