Skip to content

[beta] backport fix for publishing with optional dependencies. #8893

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

Merged
merged 1 commit into from
Nov 24, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Nov 24, 2020

Beta backport of #8853.

Fix publishing with optional dependencies.

In rust-lang#8799, I neglected to update the `publish` code to use the correct features when generating the JSON to upload to the registry. The `Cargo.toml` file was correctly updated, but the JSON was not.  This caused Cargo to send the implicit `dep:` feature syntax in the JSON blob, which crates.io rejects.  The solution here is to use the original feature map before the implicit features have been added.
@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.49.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 Nov 24, 2020
@Eh2406
Copy link
Contributor

Eh2406 commented Nov 24, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Nov 24, 2020

📌 Commit 24438a4 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 Nov 24, 2020
@bors
Copy link
Contributor

bors commented Nov 24, 2020

⌛ Testing commit 24438a4 with merge a6684b4...

@bors
Copy link
Contributor

bors commented Nov 24, 2020

☀️ Test successful - checks-actions
Approved by: Eh2406
Pushing a6684b4 to rust-1.49.0...

@bors bors merged commit a6684b4 into rust-lang:rust-1.49.0 Nov 24, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 24, 2020
…acrum

[beta] Update cargo

2 commits in 8662ab427a8d6ad8047811cc4d78dbd20dd07699..b9216831aac72cfa8167996e3a94d976461e3fd9
2020-11-12 03:47:53 +0000 to 2020-11-24 16:59:56 +0000
- [beta] backport doc fix for CARGO_PRIMARY_PACKAGE (rust-lang/cargo#8896)
- [beta] backport fix for publishing with optional dependencies. (rust-lang/cargo#8893)
@ehuss ehuss added this to the 1.49.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.

4 participants