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

Reorganizing stacked_borrows in anticipation of a different model #2697

Merged
merged 5 commits into from
Dec 2, 2022

Conversation

Vanille-N
Copy link
Contributor

@Vanille-N Vanille-N commented Nov 27, 2022

These commits reorganize all the code inside the former stacked_borrows module and extract the part that really is specific to Stacked Borrows inside the borrow_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".

@RalfJung
Copy link
Member

Please don't include any merge commits in PRs. If there is a conflict, do a rebase instead.

@Vanille-N Vanille-N force-pushed the borrow-tracking branch 2 times, most recently from 0695853 to fb31de4 Compare November 27, 2022 09:49
@bors
Copy link
Contributor

bors commented Nov 27, 2022

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

Copy link
Member

@RalfJung RalfJung left a 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. :)

@RalfJung
Copy link
Member

@rustbot author

(call rustbot ready when this is ready for another round of review)

@rustbot rustbot added the S-waiting-on-author Status: Waiting for the PR author to address review comments label Nov 29, 2022
@Vanille-N
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Waiting for a review to complete and removed S-waiting-on-author Status: Waiting for the PR author to address review comments labels Nov 29, 2022
Copy link
Member

@RalfJung RalfJung left a 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.)

@bors
Copy link
Contributor

bors commented Dec 1, 2022

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

@RalfJung
Copy link
Member

RalfJung commented Dec 1, 2022

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: Waiting for the PR author to address review comments and removed S-waiting-on-review Status: Waiting for a review to complete labels Dec 1, 2022
@Vanille-N
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Waiting for a review to complete and removed S-waiting-on-author Status: Waiting for the PR author to address review comments labels Dec 2, 2022
@RalfJung
Copy link
Member

RalfJung commented Dec 2, 2022

Looks good. :) Just a few final nits. Then please squash this into one (or a few) commits and we are good to go!

@RalfJung
Copy link
Member

RalfJung commented Dec 2, 2022

(force-pushes do not always generate GH notifications, so make sure to always post a note in the PR if you want another review)

@RalfJung
Copy link
Member

RalfJung commented Dec 2, 2022

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Dec 2, 2022

📌 Commit 7cae2e9 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 2, 2022

⌛ Testing commit 7cae2e9 with merge cfa28cf...

@bors
Copy link
Contributor

bors commented Dec 2, 2022

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing cfa28cf to master...

@bors bors merged commit cfa28cf into rust-lang:master Dec 2, 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: Waiting for a review to complete
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants