diff --git a/src/test/compile-fail/block-deinitializes-upvar.rs b/src/test/compile-fail/block-deinitializes-upvar.rs index 1b7d98feab5..c4ea3483196 100644 --- a/src/test/compile-fail/block-deinitializes-upvar.rs +++ b/src/test/compile-fail/block-deinitializes-upvar.rs @@ -1,4 +1,4 @@ -// error-pattern:moving out of immutable upvar +// error-pattern:moving out of immutable variable declared in an outer block fn force(f: fn()) { f(); } fn main() { let mut x = @{x: 17, y: 2}; diff --git a/src/test/compile-fail/borrowck-lend-flow.rs b/src/test/compile-fail/borrowck-lend-flow.rs index e3916867412..b4d81aa09ae 100644 --- a/src/test/compile-fail/borrowck-lend-flow.rs +++ b/src/test/compile-fail/borrowck-lend-flow.rs @@ -63,7 +63,7 @@ fn loop_in_block() { let mut v = ~3, w = ~4; let mut _x = &mut w; for uint::range(0u, 10u) {|_i| - borrow(v); //! ERROR loan of mutable upvar as immutable conflicts with prior loan + borrow(v); //! ERROR loan of mutable variable declared in an outer block as immutable conflicts with prior loan _x = &mut v; //! NOTE prior loan as mutable granted here } } @@ -77,7 +77,7 @@ fn at_most_once_block() { let mut v = ~3, w = ~4; let mut _x = &mut w; at_most_once {|| - borrow(v); //! ERROR loan of mutable upvar as immutable conflicts with prior loan + borrow(v); //! ERROR loan of mutable variable declared in an outer block as immutable conflicts with prior loan _x = &mut v; //! NOTE prior loan as mutable granted here } } diff --git a/src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs b/src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs index 186229f39bd..a09d2e7a71b 100644 --- a/src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs +++ b/src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs @@ -5,7 +5,7 @@ fn borrow(v: &int, f: fn(x: &int)) { fn box_imm() { let mut v = ~3; borrow(v) { |w| //! NOTE loan of mutable local variable granted here - v = ~4; //! ERROR assigning to mutable upvar prohibited due to outstanding loan + v = ~4; //! ERROR assigning to mutable variable declared in an outer block prohibited due to outstanding loan assert *v == 3; assert *w == 4; } diff --git a/src/test/compile-fail/cap-clause-move-upvar.rs b/src/test/compile-fail/cap-clause-move-upvar.rs index c10fb806af4..3920298c355 100644 --- a/src/test/compile-fail/cap-clause-move-upvar.rs +++ b/src/test/compile-fail/cap-clause-move-upvar.rs @@ -1,7 +1,7 @@ fn main() { let x = 5; let _y = fn~(move x) -> int { - let _z = fn~(move x) -> int { x }; //! ERROR moving out of upvar + let _z = fn~(move x) -> int { x }; //! ERROR moving out of variable declared in an outer block 22 }; } diff --git a/src/test/compile-fail/issue-1965.rs b/src/test/compile-fail/issue-1965.rs index 492212fef02..0774c0d21c2 100644 --- a/src/test/compile-fail/issue-1965.rs +++ b/src/test/compile-fail/issue-1965.rs @@ -1,7 +1,7 @@ -// error-pattern:moving out of immutable upvar +// error-pattern:moving out of immutable variable declared in an outer block fn test(-x: uint) {} fn main() { let i = 3u; for uint::range(0u, 10u) {|_x| test(i)} -} \ No newline at end of file +} diff --git a/src/test/compile-fail/lambda-mutate-nested.rs b/src/test/compile-fail/lambda-mutate-nested.rs index ecc56e6408b..a989c543b54 100644 --- a/src/test/compile-fail/lambda-mutate-nested.rs +++ b/src/test/compile-fail/lambda-mutate-nested.rs @@ -1,4 +1,4 @@ -// error-pattern:assigning to immutable upvar +// error-pattern:assigning to immutable variable declared in an outer block // Make sure that nesting a block within a fn@ doesn't let us // mutate upvars from a fn@. fn f2(x: fn()) { x(); } diff --git a/src/test/compile-fail/lambda-mutate.rs b/src/test/compile-fail/lambda-mutate.rs index 0c6d8b1e7c5..ce36ac7b127 100644 --- a/src/test/compile-fail/lambda-mutate.rs +++ b/src/test/compile-fail/lambda-mutate.rs @@ -1,4 +1,4 @@ -// error-pattern:assigning to upvar +// error-pattern:assigning to variable declared in an outer block // Make sure we can't write to upvars from fn@s fn main() { let i = 0;