From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../two-phase-activation-sharing-interference.rs | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 src/test/ui/borrowck/two-phase-activation-sharing-interference.rs (limited to 'src/test/ui/borrowck/two-phase-activation-sharing-interference.rs') diff --git a/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs b/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs deleted file mode 100644 index 8b880ff64..000000000 --- a/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs +++ /dev/null @@ -1,65 +0,0 @@ -// revisions: nll_target - -// The following revisions are disabled due to missing support from two-phase beyond autorefs -//[nll_beyond] compile-flags: -Z two-phase-beyond-autoref - -// This is an important corner case pointed out by Niko: one is -// allowed to initiate a shared borrow during a reservation, but it -// *must end* before the activation occurs. -// -// FIXME: for clarity, diagnostics for these cases might be better off -// if they specifically said "cannot activate mutable borrow of `x`" -// -// The convention for the listed revisions: "lxl" means lexical -// lifetimes (which can be easier to reason about). "nll" means -// non-lexical lifetimes. "nll_target" means the initial conservative -// two-phase borrows that only applies to autoref-introduced borrows. -// "nll_beyond" means the generalization of two-phase borrows to all -// `&mut`-borrows (doing so makes it easier to write code for specific -// corner cases). - -#![allow(dead_code)] - -fn read(_: &i32) { } - -fn ok() { - let mut x = 3; - let y = &mut x; - { let z = &x; read(z); } - //[nll_target]~^ ERROR cannot borrow `x` as immutable because it is also borrowed as mutable - *y += 1; -} - -fn not_ok() { - let mut x = 3; - let y = &mut x; - let z = &x; - //[nll_target]~^ ERROR cannot borrow `x` as immutable because it is also borrowed as mutable - *y += 1; - //[lxl_beyond]~^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable - //[nll_beyond]~^^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable - read(z); -} - -fn should_be_ok_with_nll() { - let mut x = 3; - let y = &mut x; - let z = &x; - //[nll_target]~^ ERROR cannot borrow `x` as immutable because it is also borrowed as mutable - read(z); - *y += 1; - //[lxl_beyond]~^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable - // (okay with (generalized) nll today) -} - -fn should_also_eventually_be_ok_with_nll() { - let mut x = 3; - let y = &mut x; - let _z = &x; - //[nll_target]~^ ERROR cannot borrow `x` as immutable because it is also borrowed as mutable - *y += 1; - //[lxl_beyond]~^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable - // (okay with (generalized) nll today) -} - -fn main() { } -- cgit v1.2.3