Fix publication of packages with metadata and resolver#9300
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 25, 2021
Merged
Fix publication of packages with metadata and resolver#9300bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
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.
|
r? @Eh2406 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
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... |
Member
Author
|
r? @ehuss |
alexcrichton
added a commit
to alexcrichton/wasmtime
that referenced
this pull request
Mar 25, 2021
Needs resolution of rust-lang/cargo#9300 first
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
Contributor
|
Sorry, always forget about checking for that. Backport definitely! @bors r+ |
Contributor
|
📌 Commit 6bc7455 has been approved by |
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
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)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit fixes an issue where packages which specify
resolver = '2'cannot be packaged if they also have a
package.metadatatable. Theissue is that the
tomlserialization implementation serializes fieldsin order which requires that tables be emitted last.