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

Fix publication of packages with metadata and resolver #9300

Merged
merged 1 commit into from
Mar 25, 2021

Conversation

alexcrichton
Copy link
Member

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.

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 rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2021
@alexcrichton
Copy link
Member Author

I think that we'll definitely want to backport this, and ideally it might be nice if we could get a point release, but I don't think this alone would justify a point release...

@alexcrichton
Copy link
Member Author

r? @ehuss

@rust-highfive rust-highfive assigned ehuss and unassigned Eh2406 Mar 25, 2021
alexcrichton added a commit to alexcrichton/wasmtime that referenced this pull request Mar 25, 2021
alexcrichton added a commit to bytecodealliance/wasmtime that referenced this pull request Mar 25, 2021
* Use stable Rust on CI to test the x64 backend

This commit leverages the newly-released 1.51.0 compiler to test the
new backend on Windows and Linux with a stable compiler instead of a
nightly compiler. This isolates the nightly build to just the nightly
documentation generation and fuzzing, both of which rely on nightly for
the best results right now.

* Use updated stable in book build job

* Run rustfmt for new stable

* Silence new warnings for wasi-nn

* Allow some dead code in the x64 backend

Looks like new rustc is better about emitting some dead-code warnings

* Update rust in peepmatic job

* Fix a test in the pooling allocator

* Remove `package.metdata.docs.rs` temporarily

Needs resolution of rust-lang/cargo#9300 first

* Fix a warning in a wasi-nn example
@ehuss
Copy link
Contributor

ehuss commented Mar 25, 2021

Sorry, always forget about checking for that. Backport definitely!

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 25, 2021

📌 Commit 6bc7455 has been approved by ehuss

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

bors commented Mar 25, 2021

⌛ Testing commit 6bc7455 with merge 8e24bb0...

@bors
Copy link
Collaborator

bors commented Mar 25, 2021

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 8e24bb0 to master...

@bors bors merged commit 8e24bb0 into rust-lang:master Mar 25, 2021
bors added a commit that referenced this pull request Mar 26, 2021
[beta] Fix publication of packages with metadata and resolver

This is as backport of #9300
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 26, 2021
Update cargo

12 commits in 90691f2bfe9a50291a98983b1ed2feab51d5ca55..1e8703890f285befb5e32627ad4e0a0454dde1fb
2021-03-16 21:36:55 +0000 to 2021-03-26 16:59:39 +0000
- tests: Tolerate "exit status" in error messages (rust-lang/cargo#9307)
- Default macOS targets to `unpacked` debuginfo (rust-lang/cargo#9298)
- Fix publication of packages with metadata and resolver (rust-lang/cargo#9300)
- Fix config includes not working. (rust-lang/cargo#9299)
- Emit note when `--future-incompat-report` had nothing to report (rust-lang/cargo#9263)
- RFC 3052: Stop including authors field in manifests made by cargo new (rust-lang/cargo#9282)
- Refactor feature handling, and improve error messages. (rust-lang/cargo#9290)
- Split out cargo-util package for cargo-test-support. (rust-lang/cargo#9292)
- Fix redundant_semicolons warning in resolver-tests. (rust-lang/cargo#9293)
- Use serde's error message option to avoid implementing `Deserialize`. (rust-lang/cargo#9237)
- Allow `cargo update` to operate with the --offline flag (rust-lang/cargo#9279)
- Fix typo in faq.md (rust-lang/cargo#9285)
@ehuss ehuss modified the milestones: 1.53.0, 1.52.0 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