chore: Remove repeated words (extension of #124924) #124948

blyxyas · 2024-05-09T23:22:41Z

When I saw #124924 I thought "Hey, I'm sure that there are far more than just two typos of this nature in the codebase". So here's some more typo-fixing.

Some found with regex, some found with a spellchecker. Every single one manually reviewed by me (along with hundreds of false negatives by the tools)

rustbot · 2024-05-09T23:22:49Z

r? @michaelwoerister

rustbot has assigned @michaelwoerister.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-05-09T23:22:52Z

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in compiler/rustc_sanitizers

cc @rust-lang/project-exploit-mitigations, @rcvalle

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Portable SIMD is developed in its own repository. If possible, consider making this change to rust-lang/portable-simd instead.

cc @calebzulawski, @programmerjake

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Manishearth · 2024-05-09T23:28:15Z

src/tools/miri/src/borrow_tracker/tree_borrows/tree.rs

@@ -704,7 +704,7 @@ impl Tree {
    }

    /// Traverses the entire tree looking for useless tags.
-    /// Returns true iff the tag it was called on is still live or has live children,


issue: no, "iff" is short for "if and only if"

Something I didn't know, thanks for the info! (Fixed)

Manishearth

two issues but otherwise fine

Manishearth · 2024-05-09T23:28:30Z

src/tools/miri/src/eval.rs

@@ -61,7 +61,7 @@ pub enum IsolatedOp {
    /// Reject an op requiring communication with the host. By
    /// default, miri rejects the op with an abort. If not, it returns
    /// an error code, and prints a warning about it. Warning levels
-    /// are controlled by `RejectOpWith` enum.
+    /// are controlled by `RejectOpWith` en um.


issue: oops?

Ironic that the typo-fixing PR has a typo. This happened because I pressed the wrong button on the typo-fixing tool 😅 (Fixed)

Manishearth · 2024-05-09T23:34:22Z

@bors r+ rollup

bors · 2024-05-09T23:34:25Z

📌 Commit 94b4fcf has been approved by Manishearth

It is now in the queue for this repository.

blyxyas · 2024-05-09T23:34:36Z

No wait I accidentally removed the second commit
@bors r-

Manishearth · 2024-05-09T23:35:12Z

i was trying to find the interdiff and confused where it went lol

blyxyas · 2024-05-09T23:38:28Z

Quirks of doing a git reset and things not going as expected (should have commit another one and rebased)
@bors r=Manishearth

bors · 2024-05-09T23:38:31Z

📌 Commit d567733 has been approved by Manishearth

It is now in the queue for this repository.

compiler-errors · 2024-05-10T00:39:24Z

@bors r-

Please remove the changes to rustfmt. They definitely don't want changes to be made to their repo made through r-l/rust unless it's necessary for keeping rustfmt building.

I would assume the same is true for other submodules in the repo, and we definitely haven't let anyone in the quite large ping list in this PR speak up, so let's leave this PR open for anyone else to chime in, since there's no particular rush to land this now. For example, I don't think this PR needs to touch rust-analyzer either.

ytmimi · 2024-05-10T03:29:41Z

@compiler-errors thanks for catching the rustfmt changes!

@blyxyas rustfmt is developed in https://github.com/rust-lang/rustfmt, and we'd appreciate if you opened a PR there.

RalfJung · 2024-05-10T05:51:44Z

src/tools/miri/miri-script/src/commands.rs

@@ -251,7 +251,7 @@ impl Command {
        cmd!(sh, "git fetch http://localhost:{JOSH_PORT}/rust-lang/rust.git@{commit}{JOSH_FILTER}.git")
            .run()
            .map_err(|e| {
-                // Try to un-do the previous `git commit`, to leave the repo in the state we found it it.
+                // Try to un-do the previous `git commit`, to leave the repo in the state we found it.


Suggested change

// Try to un-do the previous `git commit`, to leave the repo in the state we found it.

// Try to un-do the previous `git commit`, to leave the repo in the state we found it in.

RalfJung · 2024-05-10T05:53:35Z

Miri is fine with patches in-tree. However, note that we have a general policy against large typo-fix-only PRs that don't come with tooling that would prevent such PRs in the future. I guess for this PR the sunk cost is too high to close it now...

lnicola

In RA we gladly take typo fixes, but for now we definitely want them in the upstream repository.

RalfJung · 2024-05-10T06:02:00Z

Since this keeps coming up, here's the policy decision. It was more about style changes than typo fixes, so I misremembered.

Still... this should be easier to find, I just don't know how.^^

Manishearth · 2024-05-10T06:04:49Z

clippy is also fine with minor patches in tree

programmerjake · 2024-05-10T07:49:00Z

icr for sure, but iirc portable-simd is fine with typo fixes

matthiaskrgr · 2024-05-10T10:15:12Z

wondering if it makes sense to have a a tidy lint for this.

programmerjake · 2024-05-10T10:30:33Z

wondering if it makes sense to have a a tidy lint for this.

false positives would not be all that uncommon...
e.g.:

rust/compiler/rustc_codegen_cranelift/.github/actions/github-release/README.md

Line 10 in f7b1501

To handle all this this action rolls-its-own implementation using the

matthiaskrgr · 2024-05-10T10:32:31Z

I think there should be a comma after the first 'this'? 🤔 Should prevent the lint from firing then.

Chore: Fix some typos rust-lang/rust#124948 > In RA we gladly take typo fixes, but for now we definitely want them in the upstream repository.

rustbot · 2024-05-18T16:08:22Z

Some changes occurred in src/tools/cargo

cc @ehuss

compiler-errors · 2024-05-18T16:10:15Z

Pls fix the cargo subtree modification, otherwise looks fine to me.

Chore: Fix some typos rust-lang#124948 > In RA we gladly take typo fixes, but for now we definitely want them in the upstream repository.

blyxyas · 2024-05-19T18:09:14Z

It should be all right now! :D

compiler-errors · 2024-05-19T18:12:46Z

@bors r+

bors · 2024-05-19T18:12:49Z

📌 Commit c5c820e has been approved by compiler-errors

It is now in the queue for this repository.

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#124948 (chore: Remove repeated words (extension of rust-lang#124924)) - rust-lang#124992 (Add example to IsTerminal::is_terminal) - rust-lang#125279 (make `Debug` impl for `Term` simpler) - rust-lang#125286 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#124948 - blyxyas:remove-repeated-words, r=compiler-errors chore: Remove repeated words (extension of rust-lang#124924) When I saw rust-lang#124924 I thought "Hey, I'm sure that there are far more than just two typos of this nature in the codebase". So here's some more typo-fixing. Some found with regex, some found with a spellchecker. Every single one manually reviewed by me (along with hundreds of false negatives by the tools)

…ompiler-errors chore: Remove repeated words (extension of rust-lang#124924) When I saw rust-lang#124924 I thought "Hey, I'm sure that there are far more than just two typos of this nature in the codebase". So here's some more typo-fixing. Some found with regex, some found with a spellchecker. Every single one manually reviewed by me (along with hundreds of false negatives by the tools)

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#124948 (chore: Remove repeated words (extension of rust-lang#124924)) - rust-lang#124992 (Add example to IsTerminal::is_terminal) - rust-lang#125279 (make `Debug` impl for `Term` simpler) - rust-lang#125286 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned michaelwoerister May 9, 2024

rustbot added A-rustdoc-json Area: Rustdoc JSON backend T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 9, 2024

Manishearth reviewed May 9, 2024

View reviewed changes

Manishearth requested changes May 9, 2024

View reviewed changes

blyxyas force-pushed the remove-repeated-words branch from 9894740 to 94b4fcf Compare May 9, 2024 23:31

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 May 9, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 9, 2024

blyxyas force-pushed the remove-repeated-words branch from 94b4fcf to d567733 Compare May 9, 2024 23:35

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 9, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 10, 2024

RalfJung reviewed May 10, 2024

View reviewed changes

lnicola suggested changes May 10, 2024

View reviewed changes

blyxyas mentioned this pull request May 15, 2024

Chore: Fix some typos rust-lang/rust-analyzer#17241

Merged

blyxyas force-pushed the remove-repeated-words branch from d567733 to e38377d Compare May 18, 2024 16:08

Fix typos (taking into account review comments)

c5c820e

blyxyas force-pushed the remove-repeated-words branch from e38377d to c5c820e Compare May 18, 2024 16:12

lnicola pushed a commit to lnicola/rust that referenced this pull request May 19, 2024

Auto merge of rust-lang#17241 - blyxyas:fix-typos, r=lnicola

65dbe8e

Chore: Fix some typos rust-lang#124948 > In RA we gladly take typo fixes, but for now we definitely want them in the upstream repository.

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 19, 2024

matthiaskrgr mentioned this pull request May 19, 2024

Rollup of 4 pull requests #125294

Merged

bors merged commit d5bef41 into rust-lang:master May 19, 2024
6 checks passed

rustbot added this to the 1.80.0 milestone May 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Remove repeated words (extension of #124924) #124948

chore: Remove repeated words (extension of #124924) #124948

blyxyas commented May 9, 2024

rustbot commented May 9, 2024

rustbot commented May 9, 2024

Manishearth May 9, 2024

blyxyas May 9, 2024

Manishearth left a comment

Manishearth May 9, 2024

blyxyas May 9, 2024

Manishearth commented May 9, 2024

bors commented May 9, 2024

blyxyas commented May 9, 2024

Manishearth commented May 9, 2024

blyxyas commented May 9, 2024

bors commented May 9, 2024

compiler-errors commented May 10, 2024 •

edited

Loading

ytmimi commented May 10, 2024

RalfJung May 10, 2024

RalfJung commented May 10, 2024

lnicola left a comment

RalfJung commented May 10, 2024

Manishearth commented May 10, 2024

programmerjake commented May 10, 2024

matthiaskrgr commented May 10, 2024

programmerjake commented May 10, 2024

matthiaskrgr commented May 10, 2024

rustbot commented May 18, 2024

compiler-errors commented May 18, 2024

blyxyas commented May 19, 2024

compiler-errors commented May 19, 2024

bors commented May 19, 2024

	// Try to un-do the previous `git commit`, to leave the repo in the state we found it.
	// Try to un-do the previous `git commit`, to leave the repo in the state we found it in.

chore: Remove repeated words (extension of #124924) #124948

chore: Remove repeated words (extension of #124924) #124948

Conversation

blyxyas commented May 9, 2024

rustbot commented May 9, 2024

rustbot commented May 9, 2024

Manishearth May 9, 2024

Choose a reason for hiding this comment

blyxyas May 9, 2024

Choose a reason for hiding this comment

Manishearth left a comment

Choose a reason for hiding this comment

Manishearth May 9, 2024

Choose a reason for hiding this comment

blyxyas May 9, 2024

Choose a reason for hiding this comment

Manishearth commented May 9, 2024

bors commented May 9, 2024

blyxyas commented May 9, 2024

Manishearth commented May 9, 2024

blyxyas commented May 9, 2024

bors commented May 9, 2024

compiler-errors commented May 10, 2024 • edited Loading

ytmimi commented May 10, 2024

RalfJung May 10, 2024

Choose a reason for hiding this comment

RalfJung commented May 10, 2024

lnicola left a comment

Choose a reason for hiding this comment

RalfJung commented May 10, 2024

Manishearth commented May 10, 2024

programmerjake commented May 10, 2024

matthiaskrgr commented May 10, 2024

programmerjake commented May 10, 2024

matthiaskrgr commented May 10, 2024

rustbot commented May 18, 2024

compiler-errors commented May 18, 2024

blyxyas commented May 19, 2024

compiler-errors commented May 19, 2024

bors commented May 19, 2024

compiler-errors commented May 10, 2024 •

edited

Loading