Skip to content

fix-typos #13194

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

Merged
merged 1 commit into from
Aug 3, 2024
Merged

fix-typos #13194

merged 1 commit into from
Aug 3, 2024

Conversation

sheshnath-at-knoldus
Copy link
Contributor

fixes some typos in lintcheck

changelog: None

@rustbot
Copy link
Collaborator

rustbot commented Jul 31, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Jarcho (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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Jul 31, 2024
@Jarcho
Copy link
Contributor

Jarcho commented Aug 1, 2024

LintcheckConfig is named that way on purpose to match the tool name. The other changes are fine.

@sheshnath-at-knoldus
Copy link
Contributor Author

ok @Jarcho

@sheshnath-at-knoldus
Copy link
Contributor Author

sheshnath-at-knoldus commented Aug 1, 2024

Do you think I should revert the changes for LintcheckConfig?

@Jarcho
Copy link
Contributor

Jarcho commented Aug 1, 2024

Yes. Reverting just the second commit would be great.

Copy link
Contributor

@Jarcho Jarcho left a comment

Choose a reason for hiding this comment

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

Just need to have the commits squashed and then we're good.

@sheshnath-at-knoldus
Copy link
Contributor Author

@Jarcho who will squashed the commits ?

@Jarcho
Copy link
Contributor

Jarcho commented Aug 3, 2024

You will have to.

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Aug 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 3, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust-clippy.git master
$ git push --force-with-lease

The following commits are merge commits:

@rustbot rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Aug 3, 2024
@Jarcho
Copy link
Contributor

Jarcho commented Aug 3, 2024

I would generally use git rebase -i HEAD~N to squash the last N commits together. There are other more concise ways to do it, but they're also more open to typos leading to problems.

@sheshnath-at-knoldus
Copy link
Contributor Author

so what should i do next ?

@Jarcho
Copy link
Contributor

Jarcho commented Aug 3, 2024

Assuming your local state and github's are the same the easiest way would be git reset HEAD~3 (will undo the last three commits), then discard the changes and force push.

Note that git reset is useful here since you only want the first commit. If you wanted to keep all of them then it wouldn't work.

@sheshnath-at-knoldus
Copy link
Contributor Author

thanks it worked

@Jarcho
Copy link
Contributor

Jarcho commented Aug 3, 2024

Thank you. @bors r+

@bors
Copy link
Contributor

bors commented Aug 3, 2024

📌 Commit b9716dd has been approved by Jarcho

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 3, 2024

⌛ Testing commit b9716dd with merge 377d72a...

@bors
Copy link
Contributor

bors commented Aug 3, 2024

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Jarcho
Pushing 377d72a to master...

@bors bors merged commit 377d72a into rust-lang:master Aug 3, 2024
8 checks passed
@sheshnath-at-knoldus sheshnath-at-knoldus deleted the fix-typos branch August 7, 2024 09:26
@sheshnath-at-knoldus sheshnath-at-knoldus restored the fix-typos branch August 7, 2024 09:27
@sheshnath-at-knoldus sheshnath-at-knoldus deleted the fix-typos branch August 7, 2024 09:28
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.

4 participants