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

Rewrite non_copy_const #13207

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

Jarcho
Copy link
Contributor

@Jarcho Jarcho commented Aug 3, 2024

fixes #12979
fixes #12951
fixes #13233

Tests still need to be finished and the docs still need to be updated, but this should otherwise ready.

changelog: Lint declare_interior_mutable_const and borrow_interior_mutable_const more precisely

@rustbot
Copy link
Collaborator

rustbot commented Aug 3, 2024

r? @llogiq

rustbot has assigned @llogiq.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Aug 3, 2024
@Jarcho Jarcho force-pushed the non_copy_const_ice branch 7 times, most recently from 43b7ea2 to f7ac39d Compare August 4, 2024 16:47
@Jarcho
Copy link
Contributor Author

Jarcho commented Aug 6, 2024

I think this is ready now. I'll just need to add an overview for the code and remove the old tests (the new ones should cover all those cases now).

#13200 still needs to be looked at as well.

@Jarcho Jarcho marked this pull request as ready for review August 6, 2024 20:57
@Jarcho Jarcho force-pushed the non_copy_const_ice branch 3 times, most recently from 1a30863 to bf4c37c Compare August 7, 2024 17:23
@Alexendoo Alexendoo linked an issue Aug 8, 2024 that may be closed by this pull request
@bors
Copy link
Collaborator

bors commented Aug 8, 2024

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

`borrow_interior_mutable_const` messages to be less assertive.
Update documentation for both lints.
@Jarcho
Copy link
Contributor Author

Jarcho commented Aug 19, 2024

@llogiq Any chance you'll finish the review before Thursday? That's the last sync to get this in for 1.83.

@bors
Copy link
Collaborator

bors commented Aug 19, 2024

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

@Jarcho
Copy link
Contributor Author

Jarcho commented Aug 20, 2024

The most pressing of the issues are now fixed in #13290.

@llogiq
Copy link
Contributor

llogiq commented Aug 28, 2024

Sorry it took so long to review, but this seems good to merge. Let's hope we're in time.

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 28, 2024

📌 Commit b2ec6f8 has been approved by llogiq

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 28, 2024

🔒 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 non_copy_const_ice (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 non_copy_const_ice --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
Auto-merging tests/ui/declare_interior_mutable_const/others.stderr
CONFLICT (content): Merge conflict in tests/ui/declare_interior_mutable_const/others.stderr
Auto-merging tests/ui/declare_interior_mutable_const/others.rs
Removing tests/ui/crashes/ice-9445.stderr
Auto-merging tests/ui/borrow_interior_mutable_const/others.stderr
CONFLICT (content): Merge conflict in tests/ui/borrow_interior_mutable_const/others.stderr
Auto-merging tests/ui/borrow_interior_mutable_const/others.rs
CONFLICT (content): Merge conflict in tests/ui/borrow_interior_mutable_const/others.rs
Auto-merging clippy_utils/src/ty.rs
Auto-merging clippy_lints/src/non_copy_const.rs
CONFLICT (content): Merge conflict in clippy_lints/src/non_copy_const.rs
Automatic merge failed; fix conflicts and then commit the result.

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
4 participants