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.

Sign up for GitHub

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

Jump to bottom

fix(vendor): Use tables for sample config #10348

Merged
merged 1 commit into from Jan 31, 2022
Merged

fix(vendor): Use tables for sample config #10348

merged 1 commit into from Jan 31, 2022

Conversation

epage
Copy link
Contributor

@epage epage commented Jan 31, 2022

Fixes #10345

@rust-highfive
Copy link

r? @ehuss

(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 Jan 31, 2022
@alexcrichton
Copy link
Member

Thanks! Mind adding a small test for this as well?

@epage
Copy link
Contributor Author

epage commented Jan 31, 2022

Mind adding a small test for this as well?

Done.

alexcrichton
alexcrichton approved these changes Jan 31, 2022
View reviewed changes
Copy link
Member

@alexcrichton alexcrichton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but I think a test is failing?

@epage
Copy link
Contributor Author

epage commented Jan 31, 2022

The test failure is independent of this change but is from a toml_edit bug fix. I forgot you all don't use a lock file and originally included the fix in #10349 but I split it out into #10350 so it can be reviewed and merged without anything else impeding it.

@alexcrichton
Copy link
Member

Ok!

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 31, 2022

📌 Commit c1539422eae714c3747f7eb2f72664a0894c6f69 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 Jan 31, 2022
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 31, 2022

📌 Commit fb9d11b has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Jan 31, 2022

⌛ Testing commit fb9d11b with merge a59d202...

@bors
Copy link
Collaborator

bors commented Jan 31, 2022

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

@bors bors merged commit a59d202 into rust-lang:master Jan 31, 2022
@bors bors mentioned this pull request Jan 31, 2022
Closed
2 tasks
@epage epage deleted the vendor branch January 31, 2022 20:05
@ehuss ehuss mentioned this pull request Feb 1, 2022
Merged
ehuss added a commit to ehuss/rust that referenced this pull request Feb 1, 2022
@ehuss
Rollup merge of rust-lang#93533 - ehuss:update-cargo, r=ehuss
81900f4 
Update cargo

10 commits in 1c034752de0df744fcd7788fcbca158830b8bf85..25fcb135d02ea897ce894b67ae021f48107d522b
2022-01-25 22:36:53 +0000 to 2022-02-01 01:32:48 +0000
- fix(install): Keep v1 file formatting the same (rust-lang/cargo#10349)
- fix(vendor): Use tables for sample config (rust-lang/cargo#10348)
- Add bash completion for `cargo clippy` (rust-lang/cargo#10347)
- Do not ignore `--features` when `--all-features` is present (rust-lang/cargo#10337)
- test: Fix compatibilty with new toml_edit (rust-lang/cargo#10350)
- extra-link-arg-etc: support all link types (credit `@davidhewitt)` (rust-lang/cargo#10274)
- Make clippy happy (rust-lang/cargo#10340)
- Update publishing link for semver rules. (rust-lang/cargo#10338)
- Normalize --path when install bin outside current workspace (rust-lang/cargo#10335)
- Bump clap to v3.0.13 (rust-lang/cargo#10336)
@ehuss ehuss added this to the 1.60.0 milestone Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexcrichton alexcrichton alexcrichton approved these changes

Assignees

@ehuss ehuss

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.

cargo vendor suggests vendor source config in inline form instead of separate tables
5 participants
@epage @rust-highfive @alexcrichton @bors @ehuss