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

Implement suggestions for unknown features in workspace #9420

Merged
merged 5 commits into from
Jun 1, 2021
Merged

Implement suggestions for unknown features in workspace #9420

merged 5 commits into from
Jun 1, 2021

Conversation

In-line
Copy link
Contributor

@In-line In-line commented Apr 27, 2021

No description provided.

@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 Apr 27, 2021
@ehuss
Copy link
Contributor

ehuss commented Apr 30, 2021 •
edited
Loading

Thanks for the PR!

I'm having trouble getting some of the suggestions to work, and I was wondering if there is something not working as expected. I can't get anything with / syntax to show a suggestion, but it looks like the code is intending for it to work. Some examples from Cargo's own workspace:

> cargo build --features cargo/deny-warning
error: none of the selected packages contains these features: cargo/deny-warning

> cargo build --features openssl/vendoredd
error: failed to select a version for `openssl`.
    ... required by package `cargo v0.54.0 (/Users/eric/Proj/rust/cargo2)`
versions that meet the requirements `=0.10.33` are: 0.10.33

the package `cargo` depends on `openssl`, with features: `vendoredd` but `openssl` does not have these features.


failed to select a version for `openssl` which could resolve this conflict

I am able to get features without / to work (although lev_distance isn't always the greatest for catching typos).

ehuss
ehuss reviewed Apr 30, 2021
View reviewed changes
Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

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

I'm a little leery of adding itertools as a dependency, but it doesn't seem too heavy, and I can't deny that it has some useful helpers.

src/cargo/core/workspace.rs Outdated Show resolved Hide resolved
In-line
In-line commented Apr 30, 2021
View reviewed changes
tests/testsuite/package_features.rs
[package]
name = "a"
version = "0.1.0"
resolver = "2"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

See #9437

@ehuss
Copy link
Contributor

ehuss commented Jun 1, 2021

Thanks! Sorry about the delay.

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 1, 2021

📌 Commit 1439dab has been approved by ehuss

@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 1, 2021
@bors
Copy link
Collaborator

bors commented Jun 1, 2021

⌛ Testing commit 1439dab with merge 5fb59b0...

@bors
Copy link
Collaborator

bors commented Jun 1, 2021

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 5fb59b0 to master...

@bors bors merged commit 5fb59b0 into rust-lang:master Jun 1, 2021
@ehuss ehuss mentioned this pull request Jun 2, 2021
Merged
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 3, 2021
@JohnTitor
Rollup merge of rust-lang#85926 - ehuss:update-cargo, r=ehuss
80c871c 
Update cargo

10 commits in e931e4796b61de593aa1097649445e535c9c7ee0..0cecbd67323ca14a7eb6505900d0d7307b00355b
2021-05-24 16:17:27 +0000 to 2021-06-01 20:09:13 +0000
- Configure hosts separately from targets when --target is specified. (rust-lang/cargo#9322)
- Add some validation to rustc-link-arg (rust-lang/cargo#9523)
- Implement suggestions for unknown features in workspace (rust-lang/cargo#9420)
- Extract common `make_dep_path` to cargo_util (rust-lang/cargo#9529)
- Add a note about rustflags compatibility. (rust-lang/cargo#9524)
- Consolidate doc collision detection. (rust-lang/cargo#9526)
- Add `--depth` option for `cargo-tree` (rust-lang/cargo#9499)
- `cargo tree -e no-proc-macro` to hide procedural macro dependencies (rust-lang/cargo#9488)
- Update to semver 1.0.0 (rust-lang/cargo#9508)
- Update tar dependency to 0.4.35 (rust-lang/cargo#9517)
@ehuss ehuss added this to the 1.54.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehuss ehuss ehuss 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.54.0
Development

Successfully merging this pull request may close these issues.
4 participants
@In-line @rust-highfive @ehuss @bors