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 sparse registry lockfile urls containing 'registry+sparse+' #11177

Merged
merged 2 commits into from
Oct 7, 2022

Conversation

arlosi
Copy link
Contributor

@arlosi arlosi commented Oct 5, 2022

The Cargo.lock file for alternative sparse registries incorrectly lists the url as registry+sparse+ rather than sparse+.

Fixes #10963

@rust-highfive
Copy link

r? @weihanglo

(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 Oct 5, 2022
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sense. Thanks for the patch!

src/cargo/core/source/source_id.rs Outdated Show resolved Hide resolved
Co-authored-by: Weihang Lo <weihanglo@users.noreply.github.com>
@weihanglo
Copy link
Member

Thank you so much!

@bors r+

@bors
Copy link
Contributor

bors commented Oct 7, 2022

📌 Commit 10d3b3d has been approved by weihanglo

It is now in the queue for this repository.

@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 Oct 7, 2022
@bors
Copy link
Contributor

bors commented Oct 7, 2022

⌛ Testing commit 10d3b3d with merge aff3bb8...

@bors
Copy link
Contributor

bors commented Oct 7, 2022

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing aff3bb8 to master...

@bors bors merged commit aff3bb8 into rust-lang:master Oct 7, 2022
weihanglo added a commit to weihanglo/rust that referenced this pull request Oct 7, 2022
4 commits in 0b84a35c2c7d70df4875a03eb19084b0e7a543ef..3cdf1ab25dc4fe56f890e8c7330d53a23ad905d3

2022-10-03 19:13:21 +0000 to 2022-10-07 17:34:03 +0000
- fix(test): Distinguish 'testname' from escaped arguments (rust-lang/cargo#11190)
- Fix sparse registry lockfile urls containing 'registry+sparse+' (rust-lang/cargo#11177)
- doc(features2): polish docs a bit (rust-lang/cargo#11185)
- Import `cargo remove` into cargo (rust-lang/cargo#11099)
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2022
Update cargo

4 commits in 0b84a35c2c7d70df4875a03eb19084b0e7a543ef..3cdf1ab25dc4fe56f890e8c7330d53a23ad905d3

2022-10-03 19:13:21 +0000 to 2022-10-07 17:34:03 +0000
- fix(test): Distinguish 'testname' from escaped arguments (rust-lang/cargo#11190)
- Fix sparse registry lockfile urls containing 'registry+sparse+' (rust-lang/cargo#11177)
- doc(features2): polish docs a bit (rust-lang/cargo#11185)
- Import `cargo remove` into cargo (rust-lang/cargo#11099)
@ehuss
Copy link
Contributor

ehuss commented Oct 8, 2022

I'm wondering if it might help to add a new SourceKind variant instead of trying to check string values. I don't recall if this was discussed anywhere, but I was wondering what you think about that?

RalfJung pushed a commit to RalfJung/miri that referenced this pull request Oct 9, 2022
Update cargo

4 commits in 0b84a35c2c7d70df4875a03eb19084b0e7a543ef..3cdf1ab25dc4fe56f890e8c7330d53a23ad905d3

2022-10-03 19:13:21 +0000 to 2022-10-07 17:34:03 +0000
- fix(test): Distinguish 'testname' from escaped arguments (rust-lang/cargo#11190)
- Fix sparse registry lockfile urls containing 'registry+sparse+' (rust-lang/cargo#11177)
- doc(features2): polish docs a bit (rust-lang/cargo#11185)
- Import `cargo remove` into cargo (rust-lang/cargo#11099)
@ehuss ehuss added this to the 1.66.0 milestone Oct 10, 2022
bors added a commit that referenced this pull request Oct 12, 2022
Add new SourceKind::SparseRegistry to differentiate sparse registries

Refactor sparse registry to have its own `SourceKind`.
Follow up from #11177 (comment)

r? `@ehuss`
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.

sparse registry: incorrect SourceID URL serialization for alt registries
5 participants