Skip to content

--help output use line wrap#12013

Merged
bors merged 1 commit intorust-lang:masterfrom
heisen-li:wrap_help
Apr 21, 2023
Merged

--help output use line wrap#12013
bors merged 1 commit intorust-lang:masterfrom
heisen-li:wrap_help

Conversation

@heisen-li
Copy link
Contributor

@heisen-li heisen-li commented Apr 21, 2023

What does this PR try to resolve?

Enable the wrap_help feature to help the output of --help wrap, making it easier to read.

Fixes #11895

@rustbot
Copy link
Collaborator

rustbot commented Apr 21, 2023

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 Apr 21, 2023
@heisen-li
Copy link
Contributor Author

heisen-li commented Apr 21, 2023

Sorry, I reopened a PR.

weihanglo
weihanglo approved these changes Apr 21, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Thanks!

It would be interesting if we could track --help output. cc #11912

@weihanglo
Copy link
Member

weihanglo commented Apr 21, 2023

BTW, the list of subcommand from cargo --help output is not wrapped. It is hard-coded here. We might want a way to fix that as well.

cargo/src/bin/cargo/cli.rs

Lines 459 to 477 in 7fb89f0

Some common cargo commands are (see all commands with --list):
build, b Compile the current package
check, c Analyze the current package and report errors, but don't build object files
clean Remove the target directory
doc, d Build this package's and its dependencies' documentation
new Create a new cargo package
init Create a new cargo package in an existing directory
add Add dependencies to a manifest file
remove Remove dependencies from a manifest file
run, r Run a binary or example of the local package
test, t Run the tests
bench Run the benchmarks
update Update dependencies listed in Cargo.lock
search Search registry for crates
publish Package and upload this package to the registry
install Install a Rust binary. Default location is $HOME/.cargo/bin
uninstall Uninstall a Rust binary
See 'cargo help <command>' for more information on a specific command.\n",

@weihanglo
Copy link
Member

weihanglo commented Apr 21, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Apr 21, 2023

📌 Commit 9ba0d44 has been approved by weihanglo

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 Apr 21, 2023
@bors
Copy link
Contributor

bors commented Apr 21, 2023

⌛ Testing commit 9ba0d44 with merge c3e3d90...

@bors
Copy link
Contributor

bors commented Apr 21, 2023

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

1 similar comment
@bors
Copy link
Contributor

bors commented Apr 21, 2023

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

@bors
Copy link
Contributor

bors commented Apr 21, 2023

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

@bors bors merged commit c3e3d90 into rust-lang:master Apr 21, 2023
@weihanglo weihanglo mentioned this pull request Apr 21, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 21, 2023
@bors
Auto merge of rust-lang#110653 - weihanglo:update-cargo, r=weihanglo
0fd50f3 
Update cargo

14 commits in d0a4cbcee614fdb7ba66e860e603a00a644d71f8..de80432f04da61d98dcbbc1572598071718ccfd2
2023-04-16 17:42:50 +0000 to 2023-04-21 13:18:32 +0000
- Bump to 0.72.0; update changelog (rust-lang/cargo#12012)
- Remove `src/doc` from `exclude` list in Cargo.toml (rust-lang/cargo#12000)
- `--help` output use line wrap (rust-lang/cargo#12013)
- Fix semver checks for 1.69 (rust-lang/cargo#12011)
- Update contributor guide with new issue labels. (rust-lang/cargo#12003)
- Better error message when getting an empty dep table (rust-lang/cargo#11997)
- Fix broken links in contributor guide. (rust-lang/cargo#12002)
- Update linux-raw-sys to 0.3.2 (rust-lang/cargo#11998)
- chore: Use globs for workspace members (rust-lang/cargo#11996)
- fix: Allow win/mac credential managers to build on all platforms (rust-lang/cargo#11993)
- Add S-triage auto-label. (rust-lang/cargo#11995)
- ci: check if Cargo.lock is up-to-date (rust-lang/cargo#11994)
- Recompile on profile rustflags changes (rust-lang/cargo#11981)
- Clarify some 1.69 changelog entries. (rust-lang/cargo#11982)
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Apr 22, 2023
@bors
Auto merge of #110653 - weihanglo:update-cargo, r=weihanglo
eaedda4 
Update cargo

14 commits in d0a4cbcee614fdb7ba66e860e603a00a644d71f8..de80432f04da61d98dcbbc1572598071718ccfd2
2023-04-16 17:42:50 +0000 to 2023-04-21 13:18:32 +0000
- Bump to 0.72.0; update changelog (rust-lang/cargo#12012)
- Remove `src/doc` from `exclude` list in Cargo.toml (rust-lang/cargo#12000)
- `--help` output use line wrap (rust-lang/cargo#12013)
- Fix semver checks for 1.69 (rust-lang/cargo#12011)
- Update contributor guide with new issue labels. (rust-lang/cargo#12003)
- Better error message when getting an empty dep table (rust-lang/cargo#11997)
- Fix broken links in contributor guide. (rust-lang/cargo#12002)
- Update linux-raw-sys to 0.3.2 (rust-lang/cargo#11998)
- chore: Use globs for workspace members (rust-lang/cargo#11996)
- fix: Allow win/mac credential managers to build on all platforms (rust-lang/cargo#11993)
- Add S-triage auto-label. (rust-lang/cargo#11995)
- ci: check if Cargo.lock is up-to-date (rust-lang/cargo#11994)
- Recompile on profile rustflags changes (rust-lang/cargo#11981)
- Clarify some 1.69 changelog entries. (rust-lang/cargo#11982)
@ehuss ehuss added this to the 1.71.0 milestone May 5, 2023
@weihanglo weihanglo mentioned this pull request Jun 3, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@weihanglo weihanglo weihanglo approved these changes

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.71.0

Development

Successfully merging this pull request may close these issues.

--help output should use line wrapping

5 participants

@heisen-li @rustbot @weihanglo @bors @ehuss