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

Do not suggest source config if nothing to vendor #10161

Merged
merged 1 commit into from
Dec 13, 2021

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Dec 4, 2021

fixes #7473

Also remove the empty vendor dir if we've just created it but didn't vendor anything.

@rust-highfive
Copy link

r? @Eh2406

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 4, 2021
@weihanglo weihanglo closed this Dec 4, 2021
@weihanglo weihanglo deleted the issue-7473 branch December 4, 2021 23:46
@weihanglo weihanglo restored the issue-7473 branch December 5, 2021 02:44
@weihanglo weihanglo reopened this Dec 5, 2021
@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Collaborator

bors commented Dec 13, 2021

📌 Commit 8a8d39a has been approved by alexcrichton

@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 Dec 13, 2021
@bors
Copy link
Collaborator

bors commented Dec 13, 2021

⌛ Testing commit 8a8d39a with merge c7db299...

@bors
Copy link
Collaborator

bors commented Dec 13, 2021

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing c7db299 to master...

@bors bors merged commit c7db299 into rust-lang:master Dec 13, 2021
@weihanglo weihanglo deleted the issue-7473 branch December 14, 2021 05:13
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 15, 2021
Update cargo

14 commits in 40dc281755137ee804bc9b3b08e782773b726e44..a359ce16073401f28b84840da85b268aa3d37c88
2021-12-06 21:54:44 +0000 to 2021-12-14 18:40:22 +0000
- Support `term.quiet` configuration (rust-lang/cargo#10152)
- Display alias target on 'cargo help <alias>` (rust-lang/cargo#10193)
- delete --host command and message (rust-lang/cargo#10145)
- Improve I/O error message for fingerprint of build script (rust-lang/cargo#10191)
- Explicitly mark aliases in `cargo list`. (rust-lang/cargo#10177)
- Don't emit "executable" JSON field for non-executables. (rust-lang/cargo#10171)
- Move scrape-examples docs to correct section. (rust-lang/cargo#10166)
- Do not suggest source config if nothing to vendor (rust-lang/cargo#10161)
- Bump versions of local deps. (rust-lang/cargo#10155)
- Bump to 0.60.0, update changelog (rust-lang/cargo#10154)
- Fix some profile documentation. (rust-lang/cargo#10153)
- Document lib before bin. (rust-lang/cargo#10172)
- Sync cargo-the-cli version with rustc. (rust-lang/cargo#10178)
- Remove `-Z future-incompat-report` from message displayed to user (rust-lang/cargo#10185)
@ehuss ehuss added this to the 1.59.0 milestone Feb 6, 2022
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Vendoring a project with no dependencies leads to misleading output
6 participants