-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Treat refs to arrays the same as owned arrays in indexing_slicing
and out_of_bounds_indexing
#6034
Conversation
r? @yaahc (rust_highfive has picked a reviewer for you, use r? to override) |
☔ The latest upstream changes (presumably #6013) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:
|
5969a4d
to
c5a8b36
Compare
☔ The latest upstream changes (presumably #5937) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:
|
@bors delegate+ r=me after rebasing ( TIL about |
✌️ @rail-rain can now approve this pull request |
📌 Commit c5a8b36 has been approved by |
🔒 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
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 Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
Oh I thought putting it in a code block would prevent bors from triggering 🤔 |
treat refs to arrays the same as arrays in `indexing_slicing` and `out_of_bounds_indexing`
c5a8b36
to
ce06472
Compare
Thank you for the review! By the way, bors' instruction for resolving conflicts is slightly different from what I do usually. Especially I don't put |
@bors r=flip1995 I've never used bors before. I hope this is what you mean ✌️. |
📌 Commit ce06472 has been approved by |
☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test |
Yeah same, I don't even know what -p does when rebasing. From the documentation:
I don't think I'll use that in the future, since we usually want to prevent merge commits in PRs 🤔
Perfect, thanks! 👍 |
Fixes #6021
...and remove
walk_ptrs_ty
in favour ofpeel_refs
, which came in 2019.changelog: Fix a false positive in
indexing_slicing
andout_of_bounds_indexing
where references to arrays weren't treated as arrays.