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

Show --help if there is no man page for subcommand #11473

Merged
merged 2 commits into from
Dec 19, 2022
Merged

Show --help if there is no man page for subcommand #11473

merged 2 commits into from
Dec 19, 2022

Conversation

Rustin170506
Copy link
Member

@Rustin170506 Rustin170506 commented Dec 12, 2022 •
edited
Loading

What does this PR try to resolve?

part of #11408

  • Show --help if there is no man page for the subcommand
  • Do not suggest cargo help config until we add a man page.

How should we test and review this PR?

  1. build cargo
  2. try cargo help config
  3. see:
➜  cargo git:(master) ✗ ./target/debug/cargo help config
Inspect configuration values

Usage: cargo config [OPTIONS] <COMMAND>

Commands:
  get  

Options:
  -v, --verbose...          Use verbose output (-vv very verbose/build.rs output)
      --color <WHEN>        Coloring: auto, always, never
      --frozen              Require Cargo.lock and cache are up to date
      --locked              Require Cargo.lock is up to date
      --offline             Run without accessing the network
      --config <KEY=VALUE>  Override a configuration value
  -Z <FLAG>                 Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details
  -h, --help                Print help information

Additional information

I am not sure I should add a test for it because I think we will add a man page for config.

@rustbot
Copy link
Collaborator

rustbot commented Dec 12, 2022

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 12, 2022
Rustin170506
Rustin170506 commented Dec 12, 2022
View reviewed changes
src/bin/cargo/commands/help.rs Outdated Show resolved Hide resolved
src/bin/cargo/commands/help.rs Outdated Show resolved Hide resolved
@Rustin170506 Rustin170506 changed the title Bail an error if there is no man page for subcommand Show --help if there is no man page for subcommand Dec 16, 2022
@Rustin170506 Rustin170506 requested review from epage and weihanglo and removed request for epage and weihanglo December 16, 2022 01:54
epage
epage reviewed Dec 16, 2022
View reviewed changes
src/bin/cargo/commands/config.rs Show resolved Hide resolved
src/bin/cargo/commands/help.rs Show resolved Hide resolved
src/bin/cargo/main.rs Show resolved Hide resolved
@Rustin170506
Show --help if there is no man page for subcommand
b514b13 
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
@Rustin170506
Remove update help for config subcommand
53fd815 
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
@Rustin170506
Copy link
Member Author

Thanks for your review! 💚 💙 💜 💛 ❤️

@epage
Copy link
Contributor

epage commented Dec 19, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Dec 19, 2022

📌 Commit 53fd815 has been approved by epage

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

bors commented Dec 19, 2022

⌛ Testing commit 53fd815 with merge 6ab160b...

@bors
Copy link
Contributor

bors commented Dec 19, 2022

☀️ Test successful - checks-actions
Approved by: epage
Pushing 6ab160b to master...

@bors bors merged commit 6ab160b into rust-lang:master Dec 19, 2022
@weihanglo weihanglo mentioned this pull request Dec 23, 2022
Merged
bors pushed a commit to rust-lang-ci/rust that referenced this pull request Dec 23, 2022
@weihanglo
Update cargo
5d3c22d 
7 commits in c994a4a638370bc7e0ffcbb0e2865afdfa7d4415..2381cbdb4e9b07090f552d34a44a529b6e620e44
2022-12-18 21:50:58 +0000 to 2022-12-23 12:19:27 +0000

- fix: deduplicate dependencies by artifact target (rust-lang/cargo#11478)
- Add warning if potentially-scrapable examples are skipped due to dev-dependencies (rust-lang/cargo#11503)
- Don't scrape examples from library targets by default (rust-lang/cargo#11499)
- Stabilize terminal-width (rust-lang/cargo#11494)
- Make sure that hash of `SourceId` is stable (rust-lang/cargo#11501)
- Use workspace lockfile when running `cargo package` and `cargo publish` (rust-lang/cargo#11477)
- Show `--help` if there is no man page for subcommand (rust-lang/cargo#11473)
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 23, 2022
@bors
Auto merge of rust-lang#106088 - weihanglo:update-cargo, r=weihanglo
2c3f284 
Update cargo

7 commits in c994a4a638370bc7e0ffcbb0e2865afdfa7d4415..2381cbdb4e9b07090f552d34a44a529b6e620e44 2022-12-18 21:50:58 +0000 to 2022-12-23 12:19:27 +0000

- fix: deduplicate dependencies by artifact target (rust-lang/cargo#11478)
- Add warning if potentially-scrapable examples are skipped due to dev-dependencies (rust-lang/cargo#11503)
- Don't scrape examples from library targets by default (rust-lang/cargo#11499)
- Stabilize terminal-width (rust-lang/cargo#11494)
- Make sure that hash of `SourceId` is stable (rust-lang/cargo#11501)
- Use workspace lockfile when running `cargo package` and `cargo publish` (rust-lang/cargo#11477)
- Show `--help` if there is no man page for subcommand (rust-lang/cargo#11473)

r? `@ghost`
@ehuss ehuss added this to the 1.68.0 milestone Dec 30, 2022
@epage epage mentioned this pull request Mar 24, 2023
Closed
@weihanglo weihanglo mentioned this pull request May 13, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo left review comments

@epage epage Awaiting requested review from epage

Assignees

@weihanglo weihanglo

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.68.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Rustin170506 @rustbot @epage @bors @weihanglo @ehuss