// option. This file may not be copied, modified, or distributed
// except according to those terms.
-// revisions: lxl nll
-//[lxl]compile-flags: -Z borrowck=mir -Z two-phase-borrows
-//[nll]compile-flags: -Z borrowck=mir -Z two-phase-borrows -Z nll
+// ignore-tidy-linelength
+
+// revisions: lxl_beyond nll_beyond nll_target
+
+//[lxl_beyond] compile-flags: -Z borrowck=mir -Z two-phase-borrows -Z two-phase-beyond-autoref
+//[nll_beyond] compile-flags: -Z borrowck=mir -Z two-phase-borrows -Z two-phase-beyond-autoref -Z nll
+//[nll_target] compile-flags: -Z borrowck=mir -Z two-phase-borrows -Z nll
// This is an important corner case pointed out by Niko: one is
// allowed to initiate a shared borrow during a reservation, but it
//
// 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)]
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;
}
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]~^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable
- //[nll]~^^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable
+ //[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
+ //[nll_target]~^^^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable
read(z);
}
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]~^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable
- // (okay with nll today)
+ //[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]~^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable
- //[nll]~^^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable
+ //[lxl_beyond]~^ ERROR cannot borrow `x` as mutable because it is also borrowed as immutable
+ // (okay with (generalized) nll today)
}
fn main() { }