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.

Sign up for GitHub

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

Jump to bottom

Stacked borrows: Support 2 phase borrows #56307

Merged
merged 4 commits into from
Dec 6, 2018
Merged

Stacked borrows: Support 2 phase borrows #56307

merged 4 commits into from
Dec 6, 2018

Conversation

RalfJung
Copy link
Member

Some infrastructure needed for Stacked Borrows to be able to handle 2-phase-borros.

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 28, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Nov 28, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 28, 2018

📌 Commit dd66e8e13ead57d9c11d4563158da47bbed7b299 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 28, 2018
@RalfJung RalfJung mentioned this pull request Nov 28, 2018
Closed
@pietroalbini pietroalbini mentioned this pull request Nov 28, 2018
Closed
@Centril Centril mentioned this pull request Dec 2, 2018
Closed
@bors
Copy link
Contributor

bors commented Dec 2, 2018

⌛ Testing commit dd66e8e13ead57d9c11d4563158da47bbed7b299 with merge e9a3109cea76ec8b09bc3d58c1207a473c2c318f...

@bors
Copy link
Contributor

bors commented Dec 2, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 2, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member Author

RalfJung commented Dec 2, 2018

That's a conflict with #56165, rebased and fixed.

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 2, 2018
@RalfJung
Copy link
Member Author

RalfJung commented Dec 2, 2018

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 2, 2018

📌 Commit 115b0a1fe90576a60569d72c0300724ef4556d69 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Dec 3, 2018

⌛ Testing commit 115b0a1fe90576a60569d72c0300724ef4556d69 with merge bdc8c2f90392ac63903a16e3410e596787f01414...

@bors
Copy link
Contributor

bors commented Dec 3, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 3, 2018
@RalfJung
Copy link
Member Author

RalfJung commented Dec 3, 2018

RLS gets broken?

---- cmd_changing_workspace_lib_retains_bin_diagnostics stdout ----
thread 'cmd_changing_workspace_lib_retains_bin_diagnostics' panicked at 'assertion failed: `(left == right)`
  left: `String("E0425")`,
 right: `"unused_variables"`', src\tools\rls\tests\tests.rs:402:5
note: Run with `RUST_BACKTRACE=1` for a backtrace.
---rls-stdout---
Content-Length: 605

Can this be spurious?

@RalfJung
Copy link
Member Author

RalfJung commented Dec 3, 2018

I rebased, tests are working locally.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 3, 2018

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Deal with EINTR in net timeout tests #56394

@bors
Copy link
Contributor

bors commented Dec 3, 2018

📌 Commit 115b0a1fe90576a60569d72c0300724ef4556d69 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 3, 2018
@RalfJung
Copy link
Member Author

RalfJung commented Dec 3, 2018

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 3, 2018

📌 Commit 9bf5e30691a7da8a6700fc428a1e253c06f0a836 has been approved by oli-obk

@RalfJung
Copy link
Member Author

RalfJung commented Dec 3, 2018

@bors r-

Once #56305 lands, this will fail because it'll break miri. I'll rebase and add the miri update here.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 3, 2018
@RalfJung
Copy link
Member Author

RalfJung commented Dec 3, 2018

Rebased

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 3, 2018

📌 Commit e6c8e9d has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 3, 2018
@bors
Copy link
Contributor

bors commented Dec 6, 2018

⌛ Testing commit e6c8e9d with merge 77a6a61...

bors added a commit that referenced this pull request Dec 6, 2018
@bors
Auto merge of #56307 - RalfJung:stacked-borrows-2-phase, r=oli-obk
77a6a61 
Stacked borrows: Support 2 phase borrows

Some infrastructure needed for Stacked Borrows to be able to handle 2-phase-borros.

r? @oli-obk
@bors
Copy link
Contributor

bors commented Dec 6, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 77a6a61 to master...

@bors bors merged commit e6c8e9d into rust-lang:master Dec 6, 2018
@jethrogb
Copy link
Contributor

jethrogb commented Dec 7, 2018 •
edited
Loading

On latest master:

$ git submodule update --init --recursive
fatal: reference is not a tree: 61f20761d3124f5a1b1caee8aa15637cc7f92d8e
Unable to checkout '61f20761d3124f5a1b1caee8aa15637cc7f92d8e' in submodule path 'src/tools/miri'

@jethrogb
Copy link
Contributor

jethrogb commented Dec 7, 2018

61f2076 exists in https://github.com/RalfJung/miri/commits/stacked-borrows-2-phase but not in https://github.com/solson/miri/commits/master

@RalfJung
Copy link
Member Author

RalfJung commented Dec 7, 2018

That is strange, because miri was still green after this PR.

But anyway that commit is going to be in master soon.

@RalfJung
Copy link
Member Author

RalfJung commented Dec 7, 2018

Hm actually there was no nightly so it'll take another day at least.

But the commit is in a branch in the main repo now, instead of just a PR. That should suffice.

@RalfJung RalfJung mentioned this pull request Dec 7, 2018
Closed
@RalfJung RalfJung deleted the stacked-borrows-2-phase branch January 9, 2019 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@RalfJung @oli-obk @bors @rust-highfive @jethrogb