Skip to content

do not remove .cargo directory #132054

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 1 commit into from
Oct 23, 2024
Merged

do not remove .cargo directory #132054

merged 1 commit into from
Oct 23, 2024

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Oct 23, 2024

If vendoring isn't used bootstrap removes .cargo directory, which prevents developers from setting certain options in the .cargo/config.toml file. This was introduced in #97513 (specifically in this commit). Also, since #123942, vendoring is now possible even in git sources, which means we shouldn't remove .cargo directory in git sources anymore.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Oct 23, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 23, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Oct 23, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 23, 2024

📌 Commit 47d6667 has been approved by Kobzol

It is now in the queue for this repository.

@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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 23, 2024
@jieyouxu jieyouxu changed the title do not remove .cargo directroy do not remove .cargo directory Oct 23, 2024
@jieyouxu
Copy link
Member

(Sorry, had to fix the title typo 😆)

fmease added a commit to fmease/rust that referenced this pull request Oct 23, 2024
do not remove `.cargo` directory

If vendoring isn't used bootstrap removes `.cargo` directory, which prevents developers from setting certain options in the `.cargo/config.toml` file. This was introduced in rust-lang#97513 (specifically in [this commit](rust-lang@345eb14)). Also, since rust-lang#123942, vendoring is now possible even in git sources, which means we shouldn't remove `.cargo` directory in git sources anymore.
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 23, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#131043 (Refactor change detection for rustdoc and download-rustc)
 - rust-lang#131181 (Compiletest: Custom differ)
 - rust-lang#131487 (Add wasm32v1-none target (compiler-team/rust-lang#791))
 - rust-lang#132054 (do not remove `.cargo` directory)
 - rust-lang#132058 (CI: rfl: use rust-next temporary commit)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bb65499 into rust-lang:master Oct 23, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 23, 2024
Rollup merge of rust-lang#132054 - onur-ozkan:cargo-config, r=Kobzol

do not remove `.cargo` directory

If vendoring isn't used bootstrap removes `.cargo` directory, which prevents developers from setting certain options in the `.cargo/config.toml` file. This was introduced in rust-lang#97513 (specifically in [this commit](rust-lang@345eb14)). Also, since rust-lang#123942, vendoring is now possible even in git sources, which means we shouldn't remove `.cargo` directory in git sources anymore.
@onur-ozkan onur-ozkan deleted the cargo-config branch December 4, 2024 12:45
# 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants