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

Added aliases to subcommand typo suggestions. #7486

Merged
merged 2 commits into from
Nov 11, 2019

Conversation

zachlute
Copy link
Contributor

@zachlute zachlute commented Oct 5, 2019

Fixes #7278.

Also adds tests for alias suggestions.

@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 Oct 5, 2019
Fixes rust-lang#7278.

Also adds tests for alias suggestions.
@zachlute
Copy link
Contributor Author

zachlute commented Oct 5, 2019

This is an improved version of #7288 that uses the existing get_table instead of creating a new method for accessing alias subkeys.

I somehow made that PR insane through using git poorly, so this is just a clean version of that PR.

@zachlute
Copy link
Contributor Author

zachlute commented Oct 5, 2019

r? @alexcrichton

Since he reviewed the original PR.

@rust-highfive rust-highfive assigned alexcrichton and unassigned ehuss Oct 5, 2019
@alexcrichton
Copy link
Member

Sorry for the delay in getting to this @zachlute!

I forget if this was handled, but can the get accessor be used instead of get_table?

@zachlute
Copy link
Contributor Author

@alexcrichton So, my initial change introduced a new get_subkeys (or something like that) method that looked up the individual subkeys on a key. You suggested not adding that new method and using get with a custom struct instead.

When I went to make that change, I realized that get_table already existed for exactly the purpose I wanted, so I just switched it to using that.

I can make further changes, of course, but this seemed to meet the requirements of 'gets the subkeys without introducing a new method' without also introducing the custom struct for that purpose?

@alexcrichton
Copy link
Member

Oh sorry this is basically the same thing, just a different formulation. Instead of get_table you'd use get::<BTreeMap<String, String>>

@zachlute
Copy link
Contributor Author

zachlute commented Nov 9, 2019

@alexcrichton Replaced the get_table usage as you recommended, and that is indeed nicer and more succinct. 👍

@alexcrichton
Copy link
Member

@bors: r+

👍

@bors
Copy link
Collaborator

bors commented Nov 11, 2019

📌 Commit 0f157f5 has been approved by alexcrichton

@alexcrichton alexcrichton reopened this Nov 11, 2019
@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 11, 2019
@alexcrichton
Copy link
Member

er oops

@bors: r+

@bors
Copy link
Collaborator

bors commented Nov 11, 2019

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Nov 11, 2019

📌 Commit 0f157f5 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Nov 11, 2019

⌛ Testing commit 0f157f5 with merge 127d2b4...

bors added a commit that referenced this pull request Nov 11, 2019
Added aliases to subcommand typo suggestions.

Fixes #7278.

Also adds tests for alias suggestions.
@bors
Copy link
Collaborator

bors commented Nov 11, 2019

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 127d2b4 to master...

@bors bors merged commit 0f157f5 into rust-lang:master Nov 11, 2019
bors added a commit to rust-lang/rust that referenced this pull request Nov 17, 2019
Update Cargo, books

## cargo

12 commits in 5da4b4d47963868d9878480197581ccbbdaece74..8280633db680dec5bfe1de25156d1a1d53e6d190
2019-10-28 21:53:41 +0000 to 2019-11-11 23:17:05 +0000
- Don't panic when parsing `/proc/stat` (rust-lang/cargo#7580)
- Fix unused configuration key warning for a few keys under `build`. (rust-lang/cargo#7575)
- Add back support for `BROWSER` envvar in `cargo doc --open`. (rust-lang/cargo#7576)
- Only include "already existing ..." comment in gitignore on conflict (rust-lang/cargo#7570)
- Add VS Code user dir to .gitignore (rust-lang/cargo#7578)
- Added aliases to subcommand typo suggestions. (rust-lang/cargo#7486)
- Use multiple requirement syntax consistently (rust-lang/cargo#7573)
- Update verison to 0.42 (rust-lang/cargo#7568)
- Expand documentation on build scripts. (rust-lang/cargo#7565)
- Update crossbeam-utils requirement from 0.6 to 0.7 (rust-lang/cargo#7566)
- don't download std-docs on CI (rust-lang/cargo#7513)
- Change my-buddy to github-handle (rust-lang/cargo#7553)

## nomicon

2 commits in 5004ad30d69f93553ceef74439fea2159d1f769e..58e36e0e08dec5a379ac568827c058e25990d6cd
2019-10-12 19:52:40 +0200 to 2019-10-30 08:14:24 -0500
- remove references to the nursery
- Add github action to replace Travis.yml (rust-lang/nomicon#172)

## reference

7 commits in 4b21b64..45558c4
2019-10-27 22:33:11 +0100 to 2019-11-08 14:47:35 +0100
- Audit code blocks. (rust-lang/reference#715)
- Update coherence and orphan rules documentation to match RFC 2451 (rust-lang/reference#703)
- Update organization name (rust-lang/reference#713)
- State that no_implicit_prelude also applies to nested modules (rust-lang/reference#707)
- expand Copy docs (rust-lang/reference#711)
- github action doesn't use the nursery (rust-lang/reference#706)
- Migrate to GitHub Actions. (rust-lang/reference#705)

## book

1 commits in 28fa3d15b0bc67ea5e79eeff2198e4277fc61baf..e79dd62aa63396714278d484d91d48826737f47f
2019-10-29 07:16:09 -0500 to 2019-10-30 07:33:12 -0500
- No need for an iterator here to fetch values (rust-lang/book#1957)

## rust-by-example

1 commits in f3197ddf2abab9abdbc029def8164f4a748b0d91..dcee312c66267eb5a2f6f1561354003950e29105
2019-10-29 10:17:40 -0300 to 2019-10-31 11:26:53 -0300
- refactor: simplify extracting Result from Option (rust-lang/rust-by-example#1283)

## edition-guide

2 commits in e58bc4ca104e890ac56af846877c874c432a64b5..f553fb26c60c4623ea88a1cfe731eafe0643ce34
2019-07-31 20:14:12 +0200 to 2019-10-30 08:27:42 -0500
- remove old references to the nursery
- Port from Travis to GitHub Actions (rust-lang/edition-guide#192)
@ehuss ehuss added this to the 1.41.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.

Include aliases in no such subcommand suggestion search
5 participants