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

docs: install options -> uninstall options #14682

Merged
merged 1 commit into from
Oct 15, 2024
Merged

docs: install options -> uninstall options #14682

merged 1 commit into from
Oct 15, 2024

Conversation

DriesDeMaeseneer
Copy link
Contributor

What does this PR try to resolve?

Fixed a typo in the cargo-uninstall.md documentation file.

@rustbot
Copy link
Collaborator

rustbot commented Oct 14, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @weihanglo (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2024
weihanglo
weihanglo reviewed Oct 14, 2024
View reviewed changes
src/doc/src/commands/cargo-uninstall.md
@@ -27,7 +27,7 @@ The installation root is determined, in order of precedence:

## OPTIONS

### Install Options
### Uninstall Options
Copy link
Member

Choose a reason for hiding this comment

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

Thank you for your contribution!

This markdown file is generated. You'll need to update the manpage template instead:

cargo/src/doc/man/cargo-uninstall.md

Line 24 in 82c489f

### Install Options

See also the doc contribution guide: https://github.com/rust-lang/cargo/tree/master/src/doc#building-the-man-pages

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the feedback!

I moved the typo to the correct file.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks! Could you squash commits into one? We would like to keep every commit passing CI if possible.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will! Thanks for your patience!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey @weihanglo, is there any way for me to stop the CI when I know that it's going to fail? It seems wasteful to run the full pipeline in that case.

Copy link
Member

Choose a reason for hiding this comment

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

Push a new rev and the old one will get cancelled.

cargo/.github/workflows/main.yml

Lines 19 to 21 in 82c489f

concurrency:
group: "${{ github.workflow }}-${{ (github.ref == 'refs/heads/try' && github.sha) || github.ref }}"
cancel-in-progress: true

@rustbot rustbot added the A-cli-help Area: built-in command-line help label Oct 14, 2024
@weihanglo
Copy link
Member

@bors r+

Thank you!

@bors
Copy link
Collaborator

bors commented Oct 14, 2024

📌 Commit 9eb1f51 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 Oct 14, 2024
bors added a commit that referenced this pull request Oct 14, 2024
@bors
Auto merge of #14682 - DriesDeMaeseneer:patch-1, r=weihanglo
51f9587 
docs: install options -> uninstall options

### What does this PR try to resolve?

Fixed a typo in the cargo-uninstall.md documentation file.
@bors
Copy link
Collaborator

bors commented Oct 14, 2024

⌛ Testing commit 9eb1f51 with merge 51f9587...

@bors
Copy link
Collaborator

bors commented Oct 14, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 14, 2024
@weihanglo
Copy link
Member

Has docker rate limit recovered?

@bors retry

@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 Oct 14, 2024
@bors
Copy link
Collaborator

bors commented Oct 14, 2024

⌛ Testing commit 9eb1f51 with merge f9e20ff...

@bors
Copy link
Collaborator

bors commented Oct 15, 2024

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

@bors bors merged commit f9e20ff into rust-lang:master Oct 15, 2024
14 of 22 checks passed
This was referenced Oct 15, 2024
Open
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2024
@bors
Auto merge of rust-lang#131750 - weihanglo:update-cargo, r=weihanglo
9ce3675 
Update cargo

14 commits in 15fbd2f607d4defc87053b8b76bf5038f2483cf4..8c30ce53688e25f7e9d860b33cc914fb2957ca9a
2024-10-08 21:08:11 +0000 to 2024-10-15 16:43:16 +0000
- docs: More information on what is and isn't included by cargo package (rust-lang/cargo#14684)
- fix(resolver): share conflict cache between activation retries (rust-lang/cargo#14692)
- fix(git): dont fetch tags by default (rust-lang/cargo#14688)
- Support package selection options like `--exclude` in `cargo publish` (rust-lang/cargo#14659)
- docs: install options -> uninstall options (rust-lang/cargo#14682)
- docs: tools should only interpret a line starting with `{` as JSON (rust-lang/cargo#14677)
- cargo test --help: clarify --tests and --benches (rust-lang/cargo#14675)
- docs(env): minor improvements in environment variables doc (rust-lang/cargo#14676)
- docs: document official external commands (rust-lang/cargo#14669)
- Fix panic when running cargo tree on a package with a cross compiled bindep (rust-lang/cargo#14593)
- Remove the support for `Cargo.toml` of the cargo-script (rust-lang/cargo#14670)
- docs(resolver): Lay groundwork for documenting MSRV-aware logic (rust-lang/cargo#14662)
- chore(deps): update rust crate pulldown-cmark to 0.12.0 (rust-lang/cargo#14668)
- Improve resolver speed (rust-lang/cargo#14663)
@rustbot rustbot added this to the 1.84.0 milestone Oct 16, 2024
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Oct 17, 2024
@bors
Auto merge of #131750 - weihanglo:update-cargo, r=weihanglo
ba7ec44 
Update cargo

14 commits in 15fbd2f607d4defc87053b8b76bf5038f2483cf4..8c30ce53688e25f7e9d860b33cc914fb2957ca9a
2024-10-08 21:08:11 +0000 to 2024-10-15 16:43:16 +0000
- docs: More information on what is and isn't included by cargo package (rust-lang/cargo#14684)
- fix(resolver): share conflict cache between activation retries (rust-lang/cargo#14692)
- fix(git): dont fetch tags by default (rust-lang/cargo#14688)
- Support package selection options like `--exclude` in `cargo publish` (rust-lang/cargo#14659)
- docs: install options -> uninstall options (rust-lang/cargo#14682)
- docs: tools should only interpret a line starting with `{` as JSON (rust-lang/cargo#14677)
- cargo test --help: clarify --tests and --benches (rust-lang/cargo#14675)
- docs(env): minor improvements in environment variables doc (rust-lang/cargo#14676)
- docs: document official external commands (rust-lang/cargo#14669)
- Fix panic when running cargo tree on a package with a cross compiled bindep (rust-lang/cargo#14593)
- Remove the support for `Cargo.toml` of the cargo-script (rust-lang/cargo#14670)
- docs(resolver): Lay groundwork for documenting MSRV-aware logic (rust-lang/cargo#14662)
- chore(deps): update rust crate pulldown-cmark to 0.12.0 (rust-lang/cargo#14668)
- Improve resolver speed (rust-lang/cargo#14663)
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
A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation 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.84.0
Development

Successfully merging this pull request may close these issues.
4 participants
@DriesDeMaeseneer @rustbot @weihanglo @bors