Stacked borrows: Support 2 phase borrows

[RalfJung]

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

r? @oli-obk

[oli-obk]

@bors r+

[bors]

📌 Commit dd66e8e13ead57d9c11d4563158da47bbed7b299 has been approved by oli-obk

[bors]

⌛ Testing commit dd66e8e13ead57d9c11d4563158da47bbed7b299 with merge e9a3109cea76ec8b09bc3d58c1207a473c2c318f...

[bors]

💔 Test failed - status-travis

[RalfJung]

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

@bors retry

[RalfJung]

@bors r=oli-obk

[bors]

📌 Commit 115b0a1fe90576a60569d72c0300724ef4556d69 has been approved by oli-obk

[bors]

⌛ Testing commit 115b0a1fe90576a60569d72c0300724ef4556d69 with merge bdc8c2f90392ac63903a16e3410e596787f01414...

[bors]

💔 Test failed - status-appveyor

[RalfJung]

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]

I rebased, tests are working locally.

@bors r=oli-obk

[bors]

💡 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]

📌 Commit 115b0a1fe90576a60569d72c0300724ef4556d69 has been approved by oli-obk

[RalfJung]

@bors r=oli-obk

[bors]

📌 Commit 9bf5e30691a7da8a6700fc428a1e253c06f0a836 has been approved by oli-obk

[RalfJung]

@bors r-

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

[RalfJung]

Rebased

@bors r=oli-obk

[bors]

📌 Commit e6c8e9d has been approved by oli-obk

[bors]

⌛ Testing commit e6c8e9d with merge 77a6a61...

[bors]

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

[jethrogb]

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]

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

[RalfJung]

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

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

[RalfJung]

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.