-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
Fix typo “a Rc” → “an Rc” (and a few more) #88226
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
label
Aug 22, 2021
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Aug 22, 2021
This was referenced Aug 22, 2021
Merged
m-ou-se
added a commit
to m-ou-se/rust
that referenced
this pull request
Aug 23, 2021
Fix typos “a”→“an” Fix typos in comments; found using a regex to find some easy instance of incorrect usage of a vs. an. While automation was used to find these, every change was checked manually. Changes in submodules get separate PRs: * rust-lang/stdarch#1201 * rust-lang/cargo#9821 * rust-lang/miri#1874 * rust-lang/rls#1746 * rust-lang/rust-analyzer#9984 _folks @ rust-analyzer are fast at merging…_ * rust-lang/rust-analyzer#9985 * rust-lang/rust-analyzer#9987 * rust-lang/rust-analyzer#9989 _For `clippy`, I don’t know if the changes should better better be moved to a PR to the original repo._ <hr> This has some overlap with rust-lang#88226, but neither is a strict superset of the other. If you want multiple commits, I can split it up; in that case, make sure to suggest a criterion for splitting.
☔ The latest upstream changes (presumably #88265) made this pull request unmergeable. Please resolve the merge conflicts. |
Unsurprisingly, I’ve created my own merge conflict here… |
…now resolved ^^ |
📌 Commit 6248dbc has been approved by |
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
Aug 24, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 25, 2021
…eulArtichaut Rollup of 16 pull requests Successful merges: - rust-lang#87944 (add Cell::as_array_of_cells, similar to Cell::as_slice_of_cells) - rust-lang#88156 (Adjust / fix documentation of `Arc::make_mut`) - rust-lang#88157 (bootstrap.py: recognize riscv64 when auto-detect) - rust-lang#88196 (Refactor `named_asm_labels` to a HIR lint) - rust-lang#88218 (Remove `Session.trait_methods_not_found`) - rust-lang#88223 (Remove the `TryV2` alias) - rust-lang#88226 (Fix typo “a Rc” → “an Rc” (and a few more)) - rust-lang#88267 (2229: Update signature for truncate function) - rust-lang#88273 (Fix references to `ControlFlow` in docs) - rust-lang#88277 (Update books) - rust-lang#88291 (Add SAFETY comments to core::slice::sort::partition_in_blocks) - rust-lang#88293 (Fix grammar in alloc test) - rust-lang#88298 (Errorkind reorder) - rust-lang#88299 (Stabilise BufWriter::into_parts) - rust-lang#88314 (Add type of a let tait test) - rust-lang#88325 (Add mutable-noalias to the release notes for 1.54) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Sep 3, 2021
Fix typos “a”→“an” Fix typos in comments; found using a regex to find some easy instance of incorrect usage of a vs. an. While automation was used to find these, every change was checked manually. Changes in submodules get separate PRs: * rust-lang/stdarch#1201 * rust-lang/cargo#9821 * rust-lang/miri#1874 * rust-lang/rls#1746 * rust-lang/rust-analyzer#9984 _folks @ rust-analyzer are fast at merging…_ * rust-lang/rust-analyzer#9985 * rust-lang/rust-analyzer#9987 * rust-lang/rust-analyzer#9989 _For `clippy`, I don’t know if the changes should better better be moved to a PR to the original repo._ <hr> This has some overlap with rust-lang#88226, but neither is a strict superset of the other. If you want multiple commits, I can split it up; in that case, make sure to suggest a criterion for splitting.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After stumbling about it in the dev-guide, I’ve devided to eliminate all mentions of “a Rc”, replacing it with “an Rc”. E.g.
(the match in the book is a false positive)
Since the dev-guide is a submodule, it’s getting a separate PR: rust-lang/rustc-dev-guide#1191
I’ve also gone ahead and done the same search for
RwLock
and hit a few cases in theOwningRef
adaption. Then, I couldn’t keep the countless cases of “a owning …” or “a owner” unaddressed, which concludes this PR.@rustbot label C-cleanup