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

Move if_then_panic to pedantic and rename to manual_assert #7810

Merged
merged 2 commits into from
Oct 28, 2021

Conversation

camsteffen
Copy link
Contributor

Closes #7718

changelog: none (lint added since last release)

@rust-highfive
Copy link

r? @flip1995

(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 Oct 12, 2021
@camsteffen
Copy link
Contributor Author

Perhaps I should rename to manual_assert also as mentioned here.

@camsteffen camsteffen force-pushed the if-then-panic-pedantic branch from 461da36 to 582bf9a Compare October 12, 2021 14:23
@camsteffen camsteffen changed the title Move if_then_panic to pedantic Move if_then_panic to pedantic and rename to manual_assert Oct 12, 2021
@bors
Copy link
Contributor

bors commented Oct 15, 2021

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

Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

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

Whoops, I should have reviewed this earlier...

r=me after rebase

We can still backport this to beta.

@camsteffen camsteffen force-pushed the if-then-panic-pedantic branch from 582bf9a to 4d4ab83 Compare October 28, 2021 14:38
@camsteffen camsteffen force-pushed the if-then-panic-pedantic branch from 4d4ab83 to 022146d Compare October 28, 2021 14:42
@camsteffen
Copy link
Contributor Author

I changed the lint name references in the changelog

@bors r=flip1995

@bors
Copy link
Contributor

bors commented Oct 28, 2021

📌 Commit 022146d has been approved by flip1995

@bors
Copy link
Contributor

bors commented Oct 28, 2021

⌛ Testing commit 022146d with merge 00821ca...

@bors
Copy link
Contributor

bors commented Oct 28, 2021

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 00821ca to master...

@bors bors merged commit 00821ca into rust-lang:master Oct 28, 2021
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request Nov 3, 2021
…lip1995

Move if_then_panic to pedantic and rename to manual_assert
bors added a commit that referenced this pull request Nov 3, 2021
[beta] Backport: Move if_then_panic to pedantic and rename to manual_assert

Backport of #7810

cc `@camsteffen`

r? `@ghost`

changelog: none (same release)
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 19, 2021
…lacrum

[beta] Backport Clippy lint renaming / regrouping

This backports PR rust-lang/rust-clippy#7810 to beta, where a lint added in the 1.57 (current beta) release cycle was renamed shortly after the beta cutoff. We want to backport this, so we don't have unnecessary `lint_store.registered_renamed` calls in the Clippy codebase forever.

(The formatting changes were necessary to pass this backport in the Clippy CI, removing it in a subtree sync would be a bit painful...)

cc `@camsteffen`
bors bot referenced this pull request in godot-rust/gdnative Nov 27, 2021
822: Fix/suppress clippy lints on nightly r=Bromeon a=chitoyuu

- Modified `LocalCell<T>` so the destructor is not called on a different thread. Allowed `clippy::non_send_fields_in_send_ty` otherwise.
- Removed mentions of `if_then_panic` which is no longer a thing (`https://github.com/rust-lang/rust-clippy/pull/7810`).
- A few other minor fixes.

Co-authored-by: Chitose Yuuzaki <[email protected]>
KarimHamidou referenced this pull request in KarimHamidou/godot-rust Feb 6, 2023
822: Fix/suppress clippy lints on nightly r=Bromeon a=chitoyuu

- Modified `LocalCell<T>` so the destructor is not called on a different thread. Allowed `clippy::non_send_fields_in_send_ty` otherwise.
- Removed mentions of `if_then_panic` which is no longer a thing (`https://github.com/rust-lang/rust-clippy/pull/7810`).
- A few other minor fixes.

Co-authored-by: Chitose Yuuzaki <[email protected]>
GuilhermeOrceziae referenced this pull request in GuilhermeOrceziae/godot-rust Feb 9, 2023
822: Fix/suppress clippy lints on nightly r=Bromeon a=chitoyuu

- Modified `LocalCell<T>` so the destructor is not called on a different thread. Allowed `clippy::non_send_fields_in_send_ty` otherwise.
- Removed mentions of `if_then_panic` which is no longer a thing (`https://github.com/rust-lang/rust-clippy/pull/7810`).
- A few other minor fixes.

Co-authored-by: Chitose Yuuzaki <[email protected]>
hesuteia referenced this pull request in hesuteia/godot-rust Feb 11, 2023
822: Fix/suppress clippy lints on nightly r=Bromeon a=chitoyuu

- Modified `LocalCell<T>` so the destructor is not called on a different thread. Allowed `clippy::non_send_fields_in_send_ty` otherwise.
- Removed mentions of `if_then_panic` which is no longer a thing (`https://github.com/rust-lang/rust-clippy/pull/7810`).
- A few other minor fixes.

Co-authored-by: Chitose Yuuzaki <[email protected]>
ecobiubiu referenced this pull request in ecobiubiu/open-rust Mar 30, 2023
822: Fix/suppress clippy lints on nightly r=Bromeon a=chitoyuu

- Modified `LocalCell<T>` so the destructor is not called on a different thread. Allowed `clippy::non_send_fields_in_send_ty` otherwise.
- Removed mentions of `if_then_panic` which is no longer a thing (`https://github.com/rust-lang/rust-clippy/pull/7810`).
- A few other minor fixes.

Co-authored-by: Chitose Yuuzaki <[email protected]>
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.

Move if_then_panic to pedantic
4 participants