Skip to content

Conversation

0xPoe
Copy link
Member

@0xPoe 0xPoe commented Dec 12, 2022

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
@0xPoe 0xPoe 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
@0xPoe 0xPoe requested review from epage and weihanglo and removed request for epage and weihanglo December 16, 2022 01:54
@0xPoe 0xPoe force-pushed the rustin-patch-help branch from 8d6ea3a to 2762b7c Compare December 19, 2022 11:03
@0xPoe 0xPoe force-pushed the rustin-patch-help branch from 06865b5 to 53fd815 Compare December 19, 2022 11:08
@0xPoe 0xPoe requested a review from epage December 19, 2022 11:41
@0xPoe
Copy link
Member Author

0xPoe commented Dec 19, 2022

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
bors pushed a commit to rust-lang-ci/rust that referenced this pull request Dec 23, 2022
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
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
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.

6 participants