Stacked borrows: Support 2 phase borrows #56307

RalfJung · 2018-11-28T08:23:53Z

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

r? @oli-obk

oli-obk · 2018-11-28T08:25:32Z

@bors r+

bors · 2018-11-28T08:25:33Z

📌 Commit dd66e8e13ead57d9c11d4563158da47bbed7b299 has been approved by oli-obk

bors · 2018-12-02T11:05:46Z

⌛ Testing commit dd66e8e13ead57d9c11d4563158da47bbed7b299 with merge e9a3109cea76ec8b09bc3d58c1207a473c2c318f...

bors · 2018-12-02T11:14:10Z

💔 Test failed - status-travis

RalfJung · 2018-12-02T11:37:41Z

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

@bors retry

RalfJung · 2018-12-02T11:39:21Z

@bors r=oli-obk

bors · 2018-12-02T11:39:22Z

📌 Commit 115b0a1fe90576a60569d72c0300724ef4556d69 has been approved by oli-obk

bors · 2018-12-03T00:47:32Z

⌛ Testing commit 115b0a1fe90576a60569d72c0300724ef4556d69 with merge bdc8c2f90392ac63903a16e3410e596787f01414...

bors · 2018-12-03T02:27:10Z

💔 Test failed - status-appveyor

RalfJung · 2018-12-03T07:15:53Z

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 · 2018-12-03T08:25:17Z

I rebased, tests are working locally.

@bors r=oli-obk

bors · 2018-12-03T08:25:18Z

💡 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 · 2018-12-03T08:25:19Z

📌 Commit 115b0a1fe90576a60569d72c0300724ef4556d69 has been approved by oli-obk

RalfJung · 2018-12-03T08:26:32Z

@bors r=oli-obk

bors · 2018-12-03T08:26:32Z

📌 Commit 9bf5e30691a7da8a6700fc428a1e253c06f0a836 has been approved by oli-obk

RalfJung · 2018-12-03T10:10:21Z

@bors r-

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

RalfJung · 2018-12-03T12:02:58Z

Rebased

@bors r=oli-obk

bors · 2018-12-03T12:02:59Z

📌 Commit e6c8e9d has been approved by oli-obk

bors · 2018-12-06T06:30:26Z

⌛ Testing commit e6c8e9d with merge 77a6a61...

@oli-obk

Stacked borrows: Support 2 phase borrows Some infrastructure needed for Stacked Borrows to be able to handle 2-phase-borros. r? @oli-obk

bors · 2018-12-06T08:50:34Z

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

jethrogb · 2018-12-07T05:40:12Z

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 · 2018-12-07T05:46:00Z

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

RalfJung · 2018-12-07T08:01:52Z

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

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

RalfJung · 2018-12-07T08:12:25Z

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.

rust-highfive assigned oli-obk Nov 28, 2018

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

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 mentioned this pull request Nov 28, 2018

Support two-phase borrows rust-lang/miri#554

Closed

pietroalbini mentioned this pull request Nov 28, 2018

Rollup of 29 pull requests #56325

Closed

Centril mentioned this pull request Dec 2, 2018

Rollup of 16 pull requests #56428

Closed

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

This comment has been minimized.

# to view

RalfJung force-pushed the stacked-borrows-2-phase branch from dd66e8e to 115b0a1 Compare December 2, 2018 11:37

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

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

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 force-pushed the stacked-borrows-2-phase branch from 115b0a1 to 9bf5e30 Compare December 3, 2018 08:25

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 force-pushed the stacked-borrows-2-phase branch from 9bf5e30 to 495aee4 Compare December 3, 2018 10:19

RalfJung added 4 commits December 3, 2018 13:02

Retag needs to know whether this is a 2-phase-reborrow

d2c19e0

provide a way to replace the tag in a Scalar/MemPlace

005df5f

fix recently added Retag statement

ef2b18a

update miri

e6c8e9d

RalfJung force-pushed the stacked-borrows-2-phase branch from 495aee4 to e6c8e9d Compare December 3, 2018 12:02

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 added a commit that referenced this pull request Dec 6, 2018

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 merged commit e6c8e9d into rust-lang:master Dec 6, 2018

RalfJung mentioned this pull request Dec 7, 2018

No nightly on 2018-12-07 #56586

Closed

RalfJung deleted the stacked-borrows-2-phase branch January 9, 2019 15:03

Stacked borrows: Support 2 phase borrows #56307

Stacked borrows: Support 2 phase borrows #56307

Uh oh!

Conversation

RalfJung commented Nov 28, 2018

Uh oh!

oli-obk commented Nov 28, 2018

Uh oh!

bors commented Nov 28, 2018

Uh oh!

bors commented Dec 2, 2018

Uh oh!

bors commented Dec 2, 2018

Uh oh!

This comment has been minimized.

RalfJung commented Dec 2, 2018

Uh oh!

RalfJung commented Dec 2, 2018

Uh oh!

bors commented Dec 2, 2018

Uh oh!

bors commented Dec 3, 2018

Uh oh!

bors commented Dec 3, 2018

Uh oh!

RalfJung commented Dec 3, 2018

Uh oh!

RalfJung commented Dec 3, 2018

Uh oh!

bors commented Dec 3, 2018

Uh oh!

bors commented Dec 3, 2018

Uh oh!

RalfJung commented Dec 3, 2018

Uh oh!

bors commented Dec 3, 2018

Uh oh!

RalfJung commented Dec 3, 2018

Uh oh!

RalfJung commented Dec 3, 2018

Uh oh!

bors commented Dec 3, 2018

Uh oh!

bors commented Dec 6, 2018

Uh oh!

bors commented Dec 6, 2018

Uh oh!

jethrogb commented Dec 7, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jethrogb commented Dec 7, 2018

Uh oh!

RalfJung commented Dec 7, 2018

Uh oh!

RalfJung commented Dec 7, 2018

Uh oh!

Uh oh!

jethrogb commented Dec 7, 2018 •

edited

Loading