Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootstap: create .cargo/config only if not present #90800

Merged
merged 1 commit into from
Nov 19, 2021

Conversation

aplanas
Copy link
Contributor

@aplanas aplanas commented Nov 11, 2021

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.

@rust-highfive
Copy link
Collaborator

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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 11, 2021
@apiraino apiraino added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Nov 11, 2021
@Mark-Simulacrum
Copy link
Member

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.

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2021
@aplanas
Copy link
Contributor Author

aplanas commented Nov 14, 2021

r=@Mark-Simulacrum

@rust-log-analyzer

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.
@jyn514
Copy link
Member

jyn514 commented Nov 18, 2021

@bors r=Mark-Simulacrum

@aplanas FYI in the future you can use @rustbot ready to switch this back to waiting-on-review, PRs that are waiting-on-author aren't always reviewed.

@bors
Copy link
Contributor

bors commented Nov 18, 2021

📌 Commit afd9dfa has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 18, 2021
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
@bors bors merged commit b542224 into rust-lang:master Nov 19, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants