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

test: Fix compatibilty with new toml_edit #10350

Merged
merged 1 commit into from
Jan 31, 2022
Merged

test: Fix compatibilty with new toml_edit #10350

merged 1 commit into from
Jan 31, 2022

Conversation

epage
Copy link
Contributor

@epage epage commented Jan 31, 2022

toml_edit fixed a bug in 0.13.4 that this test was relying on that is
meant to help with #10349. This basically restores us
back to the pre-toml_edit behavior for published manifests.

I included the Cargo.toml change to ensure any existing lock files on people's machines get updated so the test won't mysteriously start failing for them when doing a pull.

`toml_edit` fixed a bug in 0.13.4 that this test was relying on that is
meant to help with rust-lang#10349.  This basically restores us
back to the pre-toml_edit behavior for published manifests.
@rust-highfive
Copy link

r? @alexcrichton

(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

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 31, 2022

📌 Commit 0f75237 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
@bors
Copy link
Collaborator

bors commented Jan 31, 2022

⌛ Testing commit 0f75237 with merge 641a515...

@bors
Copy link
Collaborator

bors commented Jan 31, 2022

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

@bors bors merged commit 641a515 into rust-lang:master Jan 31, 2022
@epage epage deleted the edit branch January 31, 2022 18:02
ehuss added a commit to ehuss/rust that referenced this pull request Feb 1, 2022
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
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.

5 participants