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

Spelling #5753

Merged
merged 26 commits into from
Jan 25, 2024
Merged

Spelling #5753

merged 26 commits into from
Jan 25, 2024

Conversation

jsoref
Copy link
Contributor

@jsoref jsoref commented Apr 14, 2023

This PR corrects misspellings identified by the check-spelling action.

The misspellings have been reported at https://github.com/jsoref/rustfmt/actions/runs/4700253156#summary-12752086000

The action reports that the changes in this PR would make it happy: https://github.com/jsoref/rustfmt/actions/runs/4700253432#summary-12752087472

Copy link
Contributor Author

@jsoref jsoref left a comment

Choose a reason for hiding this comment

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

Most spelling corrections automatically suggested by Google Sheets (when being run on the rust repository). I've manually transplanted these commits into this repository.

All fault mine.

Comment on lines -815 to +945
- Do not remove path disambiugator inside macro #3142
- Do not remove path disambiguator inside macro #3142
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Some projects don't like changing change logs. Happy to drop.

Comment on lines -904 to +1034
- Replace '--conifig-help' with '--config=help' cb10e06
- Replace '--config-help' with '--config=help' cb10e06
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's possible this means what it said, but I'm guessing it didn't.

Comment on lines -1068 to +1198
- Implement stable ordering for impl items with the the following item priority: type, const, macro, then method fa80ddf
- Implement stable ordering for impl items with the following item priority: type, const, macro, then method fa80ddf
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Doubled words aren't technically misspellings, but spell checkers have traditionally flagged them as well

- IntellJ uses autosave, so now your files will always be formatted according to rustfmt. Alternatively you can use Ctrl+S to reformat file manually
- IntelliJ uses autosave, so now your files will always be formatted according to rustfmt. Alternatively you can use Ctrl+S to reformat file manually
Copy link
Contributor Author

Choose a reason for hiding this comment

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

brand

// Options passed in to the macro.
// Options passed into the macro.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

in to/into has been quite controversial. It's possible that the phrase pass-in is being treated as a thing in which case I could understand someone objecting, but, I parse this as pass options into container, and thus into is my preference.

tests/target/configs/indent_style/block_tab_spaces_call.rs Outdated Show resolved Hide resolved
tests/target/no_arg_with_comment.rs Outdated Show resolved Hide resolved
tests/target/no_arg_with_commnet.rs Outdated Show resolved Hide resolved
tests/target/multi-file.rs Outdated Show resolved Hide resolved
tests/source/expr.rs Outdated Show resolved Hide resolved
@calebcartwright
Copy link
Member

calebcartwright commented Jun 19, 2023

Thank you for this. I think there's some objective fixes here that we want to include, but I have some reservations about there being changes proposed under the tests directory. Often times these files consist of content that was copy/pasted from a user report/minimal repro so the spelling issues aren't particularly relevant.

However, within those tests there are other cases of intentional grammar issues to do things like hitting a certain column width, and while the tests will still pass if those are changed, the the grammar fix would (silently) break the semantics of the test. It's a really, really subtle (and mildly annoying) thing, but it's because of that factor that I feel like we'd need to do a really deep dive review of the proposed tests changes to ensure that fringe case wouldn't happen here, and we're not going to have the capacity to do that any time soon.

If you'd be up for splitting out the non-tests changes into a separate PR (or dropping the tests changes from this one) then we could go ahead and move forward with that. Otherwise this will probably be parked for the foreseeable future

@jsoref
Copy link
Contributor Author

jsoref commented Jun 19, 2023

Splitting out tests isn't a problem. Maybe tomorrow...

@ytmimi
Copy link
Contributor

ytmimi commented Jan 25, 2024

@jsoref any chance you're still interested in working on this one? If not I think we should close the PR

@jsoref
Copy link
Contributor Author

jsoref commented Jan 25, 2024

Sorry. Lemme look now.

src/syntax.rs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

@jsoref can you revert this rename. I think it's likely that the syntux.rs file is no longer used and needs to be deleted (probably best to delete it in a different PR). The syntux mod was renamed to parse back in #5143

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. And yes, if you're up for creating a PR for the cleanup, that'd be wonderful. I have limited spurts of energy and one good thing about my PRs is they tend to identify other cleanup that projects can do.

(I can try to do it, but I'm likely to get distracted...)

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, no worries. I'll handle the deletion. I appreciate the work you've already done 🙏🏼

@jsoref
Copy link
Contributor Author

jsoref commented Jan 25, 2024

Fwiw, these additional corrections probably postdate the version of rustfmt that was originally checked for this PR: https://github.com/jsoref/rustfmt/compare/5313c939ecb58788824a93e3629c9b00de25a9f3..d955b537

If you like, I can add them in, if you'd rather they wait, that's also ok.

@ytmimi
Copy link
Contributor

ytmimi commented Jan 25, 2024

Fwiw, these additional corrections probably postdate the version of rustfmt that was originally checked for this PR: https://github.com/jsoref/rustfmt/compare/5313c939ecb58788824a93e3629c9b00de25a9f3..d955b537

If you like, I can add them in, if you'd rather they wait, that's also ok.

Yes, please add these additional changes if you can!

ci/check_diff.sh Show resolved Hide resolved
src/config/mod.rs Show resolved Hide resolved
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Copy link
Contributor

@ytmimi ytmimi left a comment

Choose a reason for hiding this comment

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

Thanks again for helping to make these changes!

@ytmimi ytmimi merged commit cedb7b5 into rust-lang:master Jan 25, 2024
27 checks passed
@jsoref jsoref deleted the spelling branch January 26, 2024 00:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants