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

Add Operators lint pass #8921

Merged
merged 16 commits into from
Jun 28, 2022
Merged

Add Operators lint pass #8921

merged 16 commits into from
Jun 28, 2022

Conversation

Jarcho
Copy link
Contributor

@Jarcho Jarcho commented Jun 1, 2022

changelog: None

@rust-highfive
Copy link

r? @llogiq

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Jun 1, 2022
@Jarcho Jarcho force-pushed the merge_passes branch 2 times, most recently from 0e2314d to af5b276 Compare June 1, 2022 04:06
@Jarcho
Copy link
Contributor Author

Jarcho commented Jun 1, 2022

That should be all of them now.

@bors
Copy link
Contributor

bors commented Jun 2, 2022

☔ The latest upstream changes (presumably #8908) made this pull request unmergeable. Please resolve the merge conflicts.

@llogiq
Copy link
Contributor

llogiq commented Jun 2, 2022

Sorry, you'll have to take the rename into account.

@bors
Copy link
Contributor

bors commented Jun 3, 2022

☔ The latest upstream changes (presumably #8831) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Jun 3, 2022

☔ The latest upstream changes (presumably #8934) made this pull request unmergeable. Please resolve the merge conflicts.

@llogiq
Copy link
Contributor

llogiq commented Jun 4, 2022

As said on the other PR, thank you for your valuable work.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 4, 2022

📌 Commit e7d1d14 has been approved by llogiq

@bors
Copy link
Contributor

bors commented Jun 4, 2022

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout merge_passes (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self merge_passes --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing clippy_lints/src/self_assignment.rs
Removing clippy_lints/src/ptr_eq.rs
Removing clippy_lints/src/numeric_arithmetic.rs
Removing clippy_lints/src/needless_bitwise_bool.rs
Auto-merging clippy_lints/src/lib.rs
CONFLICT (content): Merge conflict in clippy_lints/src/lib.rs
Auto-merging clippy_lints/src/lib.register_suspicious.rs
Auto-merging clippy_lints/src/lib.register_style.rs
Auto-merging clippy_lints/src/lib.register_restriction.rs
Auto-merging clippy_lints/src/lib.register_pedantic.rs
Auto-merging clippy_lints/src/lib.register_lints.rs
Auto-merging clippy_lints/src/lib.register_correctness.rs
Auto-merging clippy_lints/src/lib.register_complexity.rs
Auto-merging clippy_lints/src/lib.register_all.rs
Removing clippy_lints/src/integer_division.rs
Removing clippy_lints/src/float_equality_without_abs.rs
Removing clippy_lints/src/erasing_op.rs
Removing clippy_lints/src/eq_op.rs
Removing clippy_lints/src/duration_subsec.rs
Removing clippy_lints/src/double_comparison.rs
Removing clippy_lints/src/assign_ops.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Jun 4, 2022

☔ The latest upstream changes (presumably #8937) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Jun 9, 2022

☔ The latest upstream changes (presumably #8954) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Jun 15, 2022

☔ The latest upstream changes (presumably #8964) made this pull request unmergeable. Please resolve the merge conflicts.

@Jarcho
Copy link
Contributor Author

Jarcho commented Jun 28, 2022

@bors r=llogiq

This seems to get conflicts every couple of days.

@bors
Copy link
Contributor

bors commented Jun 28, 2022

📌 Commit ffbba85 has been approved by llogiq

@bors
Copy link
Contributor

bors commented Jun 28, 2022

⌛ Testing commit ffbba85 with merge 23c6765...

@bors
Copy link
Contributor

bors commented Jun 28, 2022

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: llogiq
Pushing 23c6765 to master...

@bors bors merged commit 23c6765 into rust-lang:master Jun 28, 2022
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