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 #14577

Merged
merged 1 commit into from
Apr 19, 2023
Merged

Spelling #14577

merged 1 commit into from
Apr 19, 2023

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/rust-analyzer/actions/runs/4699991040#summary-12751355796

The action reports that the changes in this PR would make it happy: https://github.com/jsoref/rust-analyzer/actions/runs/4699991284#summary-12751356293

closes #14567

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 14, 2023
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.

.github/workflows/autopublish.yaml Show resolved Hide resolved
crates/hir-def/src/find_path.rs Show resolved Hide resolved
crates/hir-expand/src/lib.rs Show resolved Hide resolved
crates/hir-ty/src/tests/regression.rs Show resolved Hide resolved
// For this we utilize mutable mutable trees, which is a HACK, but it works.
// For this we utilize mutable trees, which is a HACK, but it works.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

sometimes doubled words have meaning, I'm hoping this isn't one of those cases...

Copy link
Member

Choose a reason for hiding this comment

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

Well, we have mutable immutable trees, so I'm not sure here 😄.

crates/rust-analyzer/src/config.rs Show resolved Hide resolved
docs/dev/lsp-extensions.md Show resolved Hide resolved
@Veykril
Copy link
Member

Veykril commented Apr 14, 2023

One commit per spelling fix seems a bit excessive if you ask me 😅

@lnicola
Copy link
Member

lnicola commented Apr 14, 2023

LGTM, but I'll have to take a closer look, probably tomorrow.

@jsoref
Copy link
Contributor Author

jsoref commented Apr 14, 2023

I'm happy to squash or let someone else do it.

The individual commits make it easier for me to drop/correct individual changes and rebase.

@jsoref jsoref mentioned this pull request Apr 16, 2023
Copy link
Member

@lnicola lnicola left a comment

Choose a reason for hiding this comment

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

Would you mind squashing and maybe fixing that nit (builtin)?

* a rule
* access
* after
* amount
* annotations
* assignment
* assist
* associated
* attribute
* borrowed
* built-in type
* clarification
* command
* const
* constructor
* corresponding
* counterparts
* curlies
* dependencies
* deterministic
* diagnostic
* duplicates
* edge
* edited
* efficient
* elsewhere
* execution
* expression
* extensions
* extracted
* fill
* github
* helper
* heuristic
* incomplete
* indent end
* inlay
* invocation
* lifetime
* looking
* maybe
* move
* mutability
* mutable
* necessarily
* necessary
* negative
* nonexistent
* occurred
* offsets
* offsetted
* overridden
* parameters
* params
* params_and_where_preds_in_scope
* paredit
* parent
* parentheses
* prepended if
* punctuation
* receive
* receiver
* referring
* repeated
* representing
* semantically
* separately
* shouldnot
* siblings
* similar
* something's
* statement
* struct
* structure
* surprise
* the
* this
* transparent
* unimplemented
* unnamed
* unnecessary
* unneeded
* unreachable
* unterminated
* utilities
* variant
* variants
* visibility
* work around (v)
* workaround

Signed-off-by: Josh Soref <[email protected]>
@jsoref
Copy link
Contributor Author

jsoref commented Apr 19, 2023

@lnicola applied and squashed, and thanks again for fixing the tests -- and thanks to git push --force-with-lease for reminding me that I needed to pull them in before pushing!

@lnicola
Copy link
Member

lnicola commented Apr 19, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 19, 2023

📌 Commit bc7d84c has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Apr 19, 2023

⌛ Testing commit bc7d84c with merge 2400b36...

@bors
Copy link
Collaborator

bors commented Apr 19, 2023

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 2400b36 to master...

@bors bors merged commit 2400b36 into rust-lang:master Apr 19, 2023
@jsoref jsoref deleted the spelling branch April 19, 2023 14:26
@lnicola
Copy link
Member

lnicola commented Apr 20, 2023

changelog internal (first contribution) fix all spelling mistakes

@@ -10,7 +10,7 @@ perform github releases but they all tend to have their set of drawbacks.
Additionally nothing handles deleting releases which we need for our rolling
`dev` release.

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

Choose a reason for hiding this comment

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

This sentence was correct before and sounds broken now. It needs to have "this" two times, one for the phrase, and one as an adjective of the subject. However, it probably should have had a comma before between them.

Copy link
Member

Choose a reason for hiding this comment

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

That's right, thanks.

jsoref added a commit to jsoref/rust-analyzer that referenced this pull request Apr 24, 2023
@jsoref jsoref mentioned this pull request Apr 24, 2023
jsoref added a commit to jsoref/rust-analyzer that referenced this pull request Apr 24, 2023
bors added a commit that referenced this pull request Apr 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

relevant_parmas_and_where_clauses is dangling
6 participants