-
Notifications
You must be signed in to change notification settings - Fork 361
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
Reorganizing stacked_borrows
in anticipation of a different model
#2697
Conversation
Please don't include any merge commits in PRs. If there is a conflict, do a rebase instead. |
0695853
to
fb31de4
Compare
☔ The latest upstream changes (presumably #2694) made this pull request unmergeable. Please resolve the merge conflicts. |
bf5789a
to
e2bec7c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left a ton of comments, but most are minor. :)
@rustbot author (call |
@rustbot ready |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are also still some unresolved comments from the previous round. (Github might hide them for you, be sure to click "load more" until that button disappears.)
☔ The latest upstream changes (presumably #2699) made this pull request unmergeable. Please resolve the merge conflicts. |
@rustbot author |
324052b
to
30b69cf
Compare
@rustbot ready |
Looks good. :) Just a few final nits. Then please squash this into one (or a few) commits and we are good to go! |
62080c1
to
7cae2e9
Compare
(force-pushes do not always generate GH notifications, so make sure to always post a note in the PR if you want another review) |
Thanks! @bors r+ |
☀️ Test successful - checks-actions |
These commits reorganize all the code inside the former
stacked_borrows
module and extract the part that really is specific to Stacked Borrows inside theborrow_tracker/stacked_borrows
submodule.Everything not specific to SB is put in
borrow_tracker/mod.rs
.This is so that the future Tree Borrows model can be later added as a second submodule and reuse all the contents of
borrow_tracker/mod.rs
.This reorganization is accompanied by renamings, mostly from "stacked borrows" to "borrow tracking".