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.

Sign up for GitHub

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

Jump to bottom

Use specific terminology for sparse HTTP-based registry #10764

Merged
merged 2 commits into from
Jun 17, 2022
Merged

Use specific terminology for sparse HTTP-based registry #10764

merged 2 commits into from
Jun 17, 2022

Conversation

kornelski
Copy link
Contributor

@kornelski kornelski commented Jun 17, 2022 •
edited
Loading

Before the options is popularized, I'd like to take opportunity to give it a unique name used consistently. It's been called "http" registry, but that's a rather generic term, especially that existing git-based registry also uses HTTP as its transport.

New registry URLs use sparse+https:// prefix, so calling it "sparse" registry seems more appropriate.

#9069

@rust-highfive
Copy link

r? @ehuss

(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 Jun 17, 2022
@kornelski kornelski mentioned this pull request Jun 17, 2022
Merged
@Eh2406
Copy link
Contributor

Eh2406 commented Jun 17, 2022 •
edited
Loading

I personally like the change. But if we change the -Z flag we will need to delay the announcement until it gets to nightly.

@arlosi what are your thoughts?

@arlosi
Copy link
Contributor

arlosi commented Jun 17, 2022

It does make the alignment between sparse+ and the flag clearer. I'm okay with delaying the announcement.

We can still target the next issue of TWiR on Wednesday if we get it in to Rust today.

arlosi
arlosi reviewed Jun 17, 2022
View reviewed changes
src/cargo/core/features.rs
@@ -653,7 +653,7 @@ unstable_cli_options!(
no_index_update: bool = ("Do not update the registry index even if the cache is outdated"),
panic_abort_tests: bool = ("Enable support to run tests with -Cpanic=abort"),
host_config: bool = ("Enable the [host] section in the .cargo/config.toml file"),
http_registry: bool = ("Support HTTP-based crate registries"),
sparse_registry: bool = ("Support plain-HTTP-based crate registries"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
sparse_registry: bool = ("Support plain-HTTP-based crate registries"),
sparse_registry: bool = ("Support sparse crate registries"),

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've deliberately used a different phrase here to teach users what sparse means, otherwise the help would be a variant of "--enable-flubbubl: Enables flubbubl".

src/cargo/core/source/source_id.rs Show resolved Hide resolved
src/cargo/sources/registry/http_remote.rs Outdated Show resolved Hide resolved
@Eh2406
Copy link
Contributor

Eh2406 commented Jun 17, 2022

If we want to change internal method names, we can do that at any time.
@bors r+
Lets get this in fast!

@bors
Copy link
Contributor

bors commented Jun 17, 2022

📌 Commit d4d25982ee1488302ebda9315b968ad308d28720 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 Jun 17, 2022
@bors
Copy link
Contributor

bors commented Jun 17, 2022

⌛ Testing commit d4d25982ee1488302ebda9315b968ad308d28720 with merge 91639c6491aef70099e05ce6559f5e6f9ed73084...

@bors
Copy link
Contributor

bors commented Jun 17, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 17, 2022
@Eh2406 @arlosi
HTTP-based -> sparse
288856b 
Co-authored-by: Arlo Siemsen <arkixml@gmail.com>
@Eh2406
Copy link
Contributor

Eh2406 commented Jun 17, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jun 17, 2022

📌 Commit 288856b 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 Jun 17, 2022
@bors
Copy link
Contributor

bors commented Jun 17, 2022

⌛ Testing commit 288856b with merge 8d42b0e...

@bors
Copy link
Contributor

bors commented Jun 17, 2022

☀️ Test successful - checks-actions
Approved by: Eh2406
Pushing 8d42b0e to master...

@bors bors merged commit 8d42b0e into rust-lang:master Jun 17, 2022
@kornelski kornelski deleted the clarify-http branch June 17, 2022 17:27
This was referenced Jun 17, 2022
Merged
Open
Merged
@arlosi arlosi mentioned this pull request Jun 17, 2022
Merged
arlosi added a commit to arlosi/rust that referenced this pull request Jun 17, 2022
@arlosi
Update cargo
b59abdc 
4 commits in 4d92f07f34ba7fb7d7f207564942508f46c225d3..8d42b0e8794ce3787c9f7d6d88b02ae80ebe8d19
2022-06-10 01:11:04 +0000 to 2022-06-17 16:46:26 +0000
- Use specific terminology for sparse HTTP-based registry (rust-lang/cargo#10764)
- chore: Upgrade to clap 3.2 (rust-lang/cargo#10753)
- Improve testing framework for http registries (rust-lang/cargo#10738)
- doc: Improve example of using the links field (rust-lang/cargo#10728)
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 18, 2022
@matthiaskrgr
Rollup merge of rust-lang#98207 - arlosi:update-cargo, r=Dylan-DPC
896ea6c 
Update cargo

4 commits in 4d92f07f34ba7fb7d7f207564942508f46c225d3..8d42b0e8794ce3787c9f7d6d88b02ae80ebe8d19
2022-06-10 01:11:04 +0000 to 2022-06-17 16:46:26 +0000
- Use specific terminology for sparse HTTP-based registry (rust-lang/cargo#10764)
- chore: Upgrade to clap 3.2 (rust-lang/cargo#10753)
- Improve testing framework for http registries (rust-lang/cargo#10738)
- doc: Improve example of using the links field (rust-lang/cargo#10728)
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 18, 2022
@matthiaskrgr
Rollup merge of rust-lang#98207 - arlosi:update-cargo, r=Dylan-DPC
431b1e4 
Update cargo

4 commits in 4d92f07f34ba7fb7d7f207564942508f46c225d3..8d42b0e8794ce3787c9f7d6d88b02ae80ebe8d19
2022-06-10 01:11:04 +0000 to 2022-06-17 16:46:26 +0000
- Use specific terminology for sparse HTTP-based registry (rust-lang/cargo#10764)
- chore: Upgrade to clap 3.2 (rust-lang/cargo#10753)
- Improve testing framework for http registries (rust-lang/cargo#10738)
- doc: Improve example of using the links field (rust-lang/cargo#10728)
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 18, 2022
@matthiaskrgr
Rollup merge of rust-lang#98207 - arlosi:update-cargo, r=Dylan-DPC
d13bead 
Update cargo

4 commits in 4d92f07f34ba7fb7d7f207564942508f46c225d3..8d42b0e8794ce3787c9f7d6d88b02ae80ebe8d19
2022-06-10 01:11:04 +0000 to 2022-06-17 16:46:26 +0000
- Use specific terminology for sparse HTTP-based registry (rust-lang/cargo#10764)
- chore: Upgrade to clap 3.2 (rust-lang/cargo#10753)
- Improve testing framework for http registries (rust-lang/cargo#10738)
- doc: Improve example of using the links field (rust-lang/cargo#10728)
@ehuss ehuss added this to the 1.63.0 milestone Jun 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arlosi arlosi arlosi left review comments

Assignees

@ehuss ehuss

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.
6 participants
@kornelski @rust-highfive @Eh2406 @arlosi @bors @ehuss