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

chore: Fix minor grammar nit in command-line help #13602

Merged
merged 1 commit into from
Mar 19, 2024

Conversation

mrobinson
Copy link
Contributor

This change fixes a very minor grammar mistake. "Require" used in this way is
typically followed by the infinitive. In addition, since "up-to-date" is used
an adjective now it should be hyphenated.

See https://www.merriam-webster.com/dictionary/up-to-date

Testing

I have run cargo test with CFG_DISABLE_CROSS_TESTS=1 as well as cargo build-man to regenerate the man pages.

Fixes #13601.

@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ehuss (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-cli Area: Command-line interface, option parsing, etc. A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation A-git Area: anything dealing with git A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. A-rebuild-detection Area: rebuild detection and fingerprinting S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2024
@mrobinson mrobinson force-pushed the fix-minor-grammar-error branch 3 times, most recently from b43904c to ce3b75e Compare March 18, 2024 10:35
@@ -1,5 +1,5 @@
{{#option "`--frozen`" "`--locked`"}}
Either of these flags requires that the `Cargo.lock` file is
Either of these flags require that the `Cargo.lock` file be
Copy link
Member

Choose a reason for hiding this comment

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

“Require” should be in singular form, as it agrees with “Either,” which is a singular subject, no?

Suggested change
Either of these flags require that the `Cargo.lock` file be
Either of these flags requires that the `Cargo.lock` file be

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, you're correct. I've updated the PR with this fix.

A *very* minor grammar correction. "Require" used in this way is
typically followed by the infinitive.
@weihanglo
Copy link
Member

@bors r+

Thanks for the grammar fix!

@bors
Copy link
Collaborator

bors commented Mar 19, 2024

📌 Commit 8fa25ba 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 Mar 19, 2024
@bors
Copy link
Collaborator

bors commented Mar 19, 2024

⌛ Testing commit 8fa25ba with merge 3e7852b...

@bors
Copy link
Collaborator

bors commented Mar 19, 2024

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

@bors bors merged commit 3e7852b into rust-lang:master Mar 19, 2024
21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2024
Update cargo

5 commits in 2fe739fcf16c5bf8c2064ab9d357f4a0e6c8539b..d438c80c45c24be676ef5867edc79d0a14910efe
2024-03-15 21:39:18 +0000 to 2024-03-19 16:11:22 +0000
- refactor(toml): Expose surce/spans for VirtualManifests (rust-lang/cargo#13603)
- cargo/init: avoid target.name assignments if possible (rust-lang/cargo#13606)
- chore: Fix minor grammar nit in command-line help (rust-lang/cargo#13602)
- Bump to 0.80.0; update changelog (rust-lang/cargo#13604)
- cargo: prevent dashes in lib.name (rust-lang/cargo#12783)

r? ghost
@rustbot rustbot added this to the 1.79.0 milestone Mar 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-cli Area: Command-line interface, option parsing, etc. A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation A-git Area: anything dealing with git A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. A-rebuild-detection Area: rebuild detection and fingerprinting 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.

Minor grammar error in cargo --help output
5 participants