fix(add): Clarify which version the features are added for #11075

epage · 2022-09-12T14:53:43Z

What does this PR try to resolve?

This gives a hint to users that we might not be showing the feature list
for the latest version but the earliest version.

Also when using a workspace dependency, this is a good reminder of what the version requirement is that was selected. That could also be useful for reused dependencies but didn't want to bother with the relevant plumbing for that.

ie we are going from

$ cargo add [email protected]
    Updating crates.io index
      Adding chrono v0.4 to dependencies.
             Features:
             - rustc-serialize
             - serde

to

$ cargo add [email protected]
    Updating crates.io index
      Adding chrono v0.4 to dependencies.
             Features as of v0.4.2:
             - rustc-serialize
             - serde

How should we test and review this PR?

I'd recommend looking at this commit-by-commit. This is broken up into several refactors leading up the main change. The refactors are focused on pulling UI logic out of dependency editing so we can more easily evolve the UI without breaking the editing API. I then tweaked the behavior in the final commit to be less redundant / noisy.

The existing tests are used to demonstrate this is working.

Additional information

I'm also mixed on whether the meta version should show up.

Fixes #11073

This optimization doesn't really make a difference and it makes it harder to separate UI / edit concerns.

This gives a hint to users that we might not be showing the feature list for the latest version but the earliest version. Also when using a workspace dependency or re-using an existing dependency, this is a good reminder of what the version requirement is that was selected. However, when the user or add (the common case) selected a full precision requirement, this is redundant. I'm also mixed on whether the meta version should show up. Fixes rust-lang#11073

This will only show the messaeg if we didn't already show a version req with full precision specified ... mostly. We'll also skip it if its a local or git dependency but we never show the version in those cases because it doesn't matter. The `precise_version` logic came from cargo-upgrade.

rust-highfive · 2022-09-12T14:53:49Z

r? @weihanglo

(rust-highfive has picked a reviewer for you, use r? to override)

src/cargo/ops/cargo_add/mod.rs

weihanglo

I am good with this. Thank you!

@Muscraft do you have any other suggestion?

weihanglo · 2022-09-13T16:39:04Z

@bors r+

bors · 2022-09-13T16:39:05Z

📌 Commit 5a6cfc9 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2022-09-13T17:08:05Z

⌛ Testing commit 5a6cfc9 with merge c633b27...

bors · 2022-09-13T17:49:35Z

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

10 commits in 646e9a0b9ea8354cc409d05f10e8dc752c5de78e..082503982ea0fb7a8fd72210427d43a2e2128a63 2022-09-02 14:29:28 +0000 to 2022-09-13 17:49:38 +0000 - Take priority into account within the pending queue (rust-lang/cargo#11032) - fix(add): Clarify which version the features are added for (rust-lang/cargo#11075) - doc: clarify config-relative paths for `--config <path>` (rust-lang/cargo#11079) - Do not add home bin path to PATH if it's already there (rust-lang/cargo#11023) - Don't use `for` loop on an `Option` (rust-lang/cargo#11081) - Remove dead code (rust-lang/cargo#11080) - Change progress indicator for sparse registries (rust-lang/cargo#11068) - chore(ci): Ensure intradoc links are valid (rust-lang/cargo#11055) - Cache index files based on contents hash (rust-lang/cargo#11044) - fix: specifies the max length for crate name (rust-lang/cargo#11051)

Update cargo 10 commits in 646e9a0b9ea8354cc409d05f10e8dc752c5de78e..082503982ea0fb7a8fd72210427d43a2e2128a63 2022-09-02 14:29:28 +0000 to 2022-09-13 17:49:38 +0000 - Take priority into account within the pending queue (rust-lang/cargo#11032) - fix(add): Clarify which version the features are added for (rust-lang/cargo#11075) - doc: clarify config-relative paths for `--config <path>` (rust-lang/cargo#11079) - Do not add home bin path to PATH if it's already there (rust-lang/cargo#11023) - Don't use `for` loop on an `Option` (rust-lang/cargo#11081) - Remove dead code (rust-lang/cargo#11080) - Change progress indicator for sparse registries (rust-lang/cargo#11068) - chore(ci): Ensure intradoc links are valid (rust-lang/cargo#11055) - Cache index files based on contents hash (rust-lang/cargo#11044) - fix: specifies the max length for crate name (rust-lang/cargo#11051)

epage added 8 commits September 12, 2022 08:59

style(add): Clean up Context import

ddd44c8

refactor(add): Decouple available features from inheritance

74e1a70

refactor(add): Consolidate looking up available features

2da6c04

This optimization doesn't really make a difference and it makes it harder to separate UI / edit concerns.

refactor(add): Pull UI concerns out of edit logic

2715b56

refactor(add): Make it easier to add more summary info

391281b

fix(add): Remove redundant version in build metadata cases

be257b8

rust-highfive assigned weihanglo Sep 12, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 12, 2022

weihanglo added the Command-add label Sep 13, 2022

Muscraft reviewed Sep 13, 2022

View reviewed changes

src/cargo/ops/cargo_add/mod.rs Outdated Show resolved Hide resolved

refactor(add): Clarify DepednencyEx's name

f1548f6

weihanglo reviewed Sep 13, 2022

View reviewed changes

src/cargo/ops/cargo_add/mod.rs Outdated Show resolved Hide resolved

src/cargo/ops/cargo_add/mod.rs Show resolved Hide resolved

src/cargo/ops/cargo_add/mod.rs Outdated Show resolved Hide resolved

epage added 2 commits September 13, 2022 11:17

chore: Document new add implementation

1a20200

style(add): Use implicit argument capture

5a6cfc9

epage force-pushed the feat branch from 7af045a to 5a6cfc9 Compare September 13, 2022 16:18

weihanglo approved these changes Sep 13, 2022

View reviewed changes

Muscraft approved these changes Sep 13, 2022

View reviewed changes

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 Sep 13, 2022

bors merged commit c633b27 into rust-lang:master Sep 13, 2022

bors mentioned this pull request Sep 13, 2022

Expose cargo add internals as edit API #11059

Merged

weihanglo mentioned this pull request Sep 13, 2022

Update cargo rust-lang/rust#101776

Merged

epage deleted the feat branch September 16, 2022 16:33

ehuss added this to the 1.65.0 milestone Sep 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(add): Clarify which version the features are added for #11075

fix(add): Clarify which version the features are added for #11075

epage commented Sep 12, 2022

rust-highfive commented Sep 12, 2022

weihanglo left a comment

weihanglo commented Sep 13, 2022

bors commented Sep 13, 2022

bors commented Sep 13, 2022

bors commented Sep 13, 2022

fix(add): Clarify which version the features are added for #11075

fix(add): Clarify which version the features are added for #11075

Conversation

epage commented Sep 12, 2022

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rust-highfive commented Sep 12, 2022

weihanglo left a comment

Choose a reason for hiding this comment

weihanglo commented Sep 13, 2022

bors commented Sep 13, 2022

bors commented Sep 13, 2022

bors commented Sep 13, 2022