Skip to content

Conversation

@alexcrichton
Copy link
Member

This is as backport of #9300

This commit fixes an issue where packages which specify `resolver = '2'`
cannot be packaged if they also have a `package.metadata` table. The
issue is that the `toml` serialization implementation serializes fields
in order which requires that tables be emitted last.
@rust-highfive
Copy link

r? @Eh2406

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

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.52.0. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 26, 2021
@Eh2406
Copy link
Contributor

Eh2406 commented Mar 26, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Mar 26, 2021

📌 Commit 129f4da has been approved by Eh2406

@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 Mar 26, 2021
@bors
Copy link
Contributor

bors commented Mar 26, 2021

⌛ Testing commit 129f4da with merge 69b5bbc...

@bors
Copy link
Contributor

bors commented Mar 26, 2021

☀️ Test successful - checks-actions
Approved by: Eh2406
Pushing 69b5bbc to rust-1.52.0...

@bors bors merged commit 69b5bbc into rust-lang:rust-1.52.0 Mar 26, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2021
[beta] Update cargo

2 commits in 90691f2bfe9a50291a98983b1ed2feab51d5ca55..d70308ef052397c7d16f881c2d973a8c5b4c23d9
2021-03-16 21:36:55 +0000 to 2021-04-06 17:32:27 +0000
- beta: revert rust-lang/cargo#8640 - rustdoc versioning checks (rust-lang/cargo#9332)
- [beta] Fix publication of packages with metadata and resolver (rust-lang/cargo#9304)
@ehuss ehuss added this to the 1.52.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.

5 participants