diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2018-02-25 02:01:39 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2018-02-26 20:24:42 +0300 |
| commit | 7ba5fd168a20cbead2afb800e638159e11bb79da (patch) | |
| tree | 285649d5d4c3e8366d319df727c7b858db69db50 /src | |
| parent | 99b1054d9f4442fd5cc535d5ad90f3542791a547 (diff) | |
| download | rust-7ba5fd168a20cbead2afb800e638159e11bb79da.tar.gz rust-7ba5fd168a20cbead2afb800e638159e11bb79da.zip | |
Update UI tests
Diffstat (limited to 'src')
168 files changed, 365 insertions, 365 deletions
diff --git a/src/test/ui/augmented-assignments.stderr b/src/test/ui/augmented-assignments.stderr index a0e69be6fb2..e04dc2f72a3 100644 --- a/src/test/ui/augmented-assignments.stderr +++ b/src/test/ui/augmented-assignments.stderr @@ -3,7 +3,7 @@ error[E0596]: cannot borrow immutable local variable `y` as mutable | LL | let y = Int(2); | - consider changing this to `mut y` -29 | //~^ consider changing this to `mut y` +LL | //~^ consider changing this to `mut y` LL | y //~ error: cannot borrow immutable local variable `y` as mutable | ^ cannot borrow mutably diff --git a/src/test/ui/blind-item-item-shadow.stderr b/src/test/ui/blind-item-item-shadow.stderr index 81957eb0953..f02dd6b3e98 100644 --- a/src/test/ui/blind-item-item-shadow.stderr +++ b/src/test/ui/blind-item-item-shadow.stderr @@ -3,14 +3,14 @@ error[E0255]: the name `foo` is defined multiple times | LL | mod foo { pub mod foo { } } | ------- previous definition of the module `foo` here -12 | +LL | LL | use foo::foo; | ^^^^^^^^ `foo` reimported here | = note: `foo` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -13 | use foo::foo as other_foo; +LL | use foo::foo as other_foo; | ^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/block-result/issue-13428.stderr b/src/test/ui/block-result/issue-13428.stderr index f17b96467f9..7f39f53d6f9 100644 --- a/src/test/ui/block-result/issue-13428.stderr +++ b/src/test/ui/block-result/issue-13428.stderr @@ -6,7 +6,7 @@ LL | fn foo() -> String { //~ ERROR mismatched types LL | | format!("Hello {}", LL | | "world") LL | | // Put the trailing semicolon on its own line to test that the -17 | | // note message gets the offending semicolon exactly +LL | | // note message gets the offending semicolon exactly LL | | ; | | - help: consider removing this semicolon LL | | } diff --git a/src/test/ui/block-result/issue-22645.stderr b/src/test/ui/block-result/issue-22645.stderr index 69e9fb6683d..03d9d03371e 100644 --- a/src/test/ui/block-result/issue-22645.stderr +++ b/src/test/ui/block-result/issue-22645.stderr @@ -13,7 +13,7 @@ error[E0308]: mismatched types | LL | fn main() { | - expected `()` because of default return type -24 | let b = Bob + 3.5; +LL | let b = Bob + 3.5; LL | b + 3 //~ ERROR E0277 | ^^^^^ expected (), found struct `Bob` | diff --git a/src/test/ui/block-result/unexpected-return-on-unit.stderr b/src/test/ui/block-result/unexpected-return-on-unit.stderr index 1baff312490..10a8814a7e5 100644 --- a/src/test/ui/block-result/unexpected-return-on-unit.stderr +++ b/src/test/ui/block-result/unexpected-return-on-unit.stderr @@ -8,11 +8,11 @@ LL | foo() //~ ERROR mismatched types found type `usize` help: try adding a semicolon | -19 | foo(); //~ ERROR mismatched types +LL | foo(); //~ ERROR mismatched types | ^ help: try adding a return type | -18 | fn bar() -> usize { +LL | fn bar() -> usize { | ^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/borrowck/borrowck-box-insensitivity.stderr b/src/test/ui/borrowck/borrowck-box-insensitivity.stderr index d8c653037b8..7bea41b2209 100644 --- a/src/test/ui/borrowck/borrowck-box-insensitivity.stderr +++ b/src/test/ui/borrowck/borrowck-box-insensitivity.stderr @@ -3,7 +3,7 @@ error[E0382]: use of moved value: `a` | LL | let _x = a.x; | -- value moved here -36 | //~^ value moved here +LL | //~^ value moved here LL | let _y = a.y; //~ ERROR use of moved | ^^ value used here after move | @@ -14,7 +14,7 @@ error[E0382]: use of moved value: `a` | LL | let _x = a.x; | -- value moved here -45 | //~^ value moved here +LL | //~^ value moved here LL | let _y = a.y; //~ ERROR use of moved | ^^ value used here after move | @@ -25,7 +25,7 @@ error[E0382]: use of moved value: `a` | LL | let _x = a.x; | -- value moved here -54 | //~^ value moved here +LL | //~^ value moved here LL | let _y = &a.y; //~ ERROR use of moved | ^^^ value used here after move | @@ -62,7 +62,7 @@ LL | let _x = &mut a.x; | --- mutable borrow occurs here (via `a.x`) LL | let _y = &a.y; //~ ERROR cannot borrow | ^^^ immutable borrow occurs here (via `a.y`) -86 | //~^ immutable borrow occurs here (via `a.y`) +LL | //~^ immutable borrow occurs here (via `a.y`) LL | } | - mutable borrow ends here @@ -73,7 +73,7 @@ LL | let _x = &a.x; | --- immutable borrow occurs here (via `a.x`) LL | let _y = &mut a.y; //~ ERROR cannot borrow | ^^^ mutable borrow occurs here (via `a.y`) -93 | //~^ mutable borrow occurs here (via `a.y`) +LL | //~^ mutable borrow occurs here (via `a.y`) LL | } | - immutable borrow ends here @@ -82,7 +82,7 @@ error[E0382]: use of collaterally moved value: `a.y` | LL | let _x = a.x.x; | -- value moved here -99 | //~^ value moved here +LL | //~^ value moved here LL | let _y = a.y; //~ ERROR use of collaterally moved | ^^ value used here after move | @@ -93,7 +93,7 @@ error[E0382]: use of collaterally moved value: `a.y` | LL | let _x = a.x.x; | -- value moved here -107| //~^ value moved here +LL | //~^ value moved here LL | let _y = a.y; //~ ERROR use of collaterally moved | ^^ value used here after move | @@ -104,7 +104,7 @@ error[E0382]: use of collaterally moved value: `a.y` | LL | let _x = a.x.x; | -- value moved here -115| //~^ value moved here +LL | //~^ value moved here LL | let _y = &a.y; //~ ERROR use of collaterally moved | ^^^ value used here after move | @@ -115,7 +115,7 @@ error[E0505]: cannot move out of `a.y` because it is borrowed | LL | let _x = &a.x.x; | ----- borrow of `a.x.x` occurs here -123| //~^ borrow of `a.x.x` occurs here +LL | //~^ borrow of `a.x.x` occurs here LL | let _y = a.y; | ^^ move out of `a.y` occurs here @@ -140,10 +140,10 @@ error[E0502]: cannot borrow `a.y` as immutable because `a.x.x` is also borrowed | LL | let _x = &mut a.x.x; | ----- mutable borrow occurs here -146| //~^ mutable borrow occurs here +LL | //~^ mutable borrow occurs here LL | let _y = &a.y; //~ ERROR cannot borrow | ^^^ immutable borrow occurs here -148| //~^ immutable borrow occurs here +LL | //~^ immutable borrow occurs here LL | } | - mutable borrow ends here @@ -152,10 +152,10 @@ error[E0502]: cannot borrow `a.y` as mutable because `a.x.x` is also borrowed as | LL | let _x = &a.x.x; | ----- immutable borrow occurs here -154| //~^ immutable borrow occurs here +LL | //~^ immutable borrow occurs here LL | let _y = &mut a.y; //~ ERROR cannot borrow | ^^^ mutable borrow occurs here -156| //~^ mutable borrow occurs here +LL | //~^ mutable borrow occurs here LL | } | - immutable borrow ends here diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut.stderr b/src/test/ui/borrowck/borrowck-closures-two-mut.stderr index 92d788630ed..7205b48399a 100644 --- a/src/test/ui/borrowck/borrowck-closures-two-mut.stderr +++ b/src/test/ui/borrowck/borrowck-closures-two-mut.stderr @@ -9,7 +9,7 @@ LL | let c2 = to_fn_mut(|| x = 5); //~ ERROR cannot borrow `x` as mutable mo | ^^ - borrow occurs due to use of `x` in closure | | | second mutable borrow occurs here -25 | //~| ERROR cannot borrow `x` as mutable more than once +LL | //~| ERROR cannot borrow `x` as mutable more than once LL | } | - first borrow ends here @@ -24,7 +24,7 @@ LL | let c2 = to_fn_mut(|| set(&mut x)); //~ ERROR cannot borrow `x` as muta | ^^ - borrow occurs due to use of `x` in closure | | | second mutable borrow occurs here -36 | //~| ERROR cannot borrow `x` as mutable more than once +LL | //~| ERROR cannot borrow `x` as mutable more than once LL | } | - first borrow ends here @@ -39,7 +39,7 @@ LL | let c2 = to_fn_mut(|| set(&mut x)); //~ ERROR cannot borrow `x` as muta | ^^ - borrow occurs due to use of `x` in closure | | | second mutable borrow occurs here -43 | //~| ERROR cannot borrow `x` as mutable more than once +LL | //~| ERROR cannot borrow `x` as mutable more than once LL | } | - first borrow ends here @@ -84,7 +84,7 @@ LL | let c2 = to_fn_mut(|| x = 5); //~ ERROR cannot borrow `x` as mutable mo | ^^ - borrow occurs due to use of `x` in closure | | | second mutable borrow occurs here -25 | //~| ERROR cannot borrow `x` as mutable more than once +LL | //~| ERROR cannot borrow `x` as mutable more than once LL | } | - first borrow ends here @@ -99,7 +99,7 @@ LL | let c2 = to_fn_mut(|| set(&mut x)); //~ ERROR cannot borrow `x` as muta | ^^ - borrow occurs due to use of `x` in closure | | | second mutable borrow occurs here -36 | //~| ERROR cannot borrow `x` as mutable more than once +LL | //~| ERROR cannot borrow `x` as mutable more than once LL | } | - first borrow ends here @@ -114,7 +114,7 @@ LL | let c2 = to_fn_mut(|| set(&mut x)); //~ ERROR cannot borrow `x` as muta | ^^ - borrow occurs due to use of `x` in closure | | | second mutable borrow occurs here -43 | //~| ERROR cannot borrow `x` as mutable more than once +LL | //~| ERROR cannot borrow `x` as mutable more than once LL | } | - first borrow ends here diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr index b3db36cf2dd..98176cce508 100644 --- a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr +++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr @@ -7,7 +7,7 @@ LL | spawn(|| books.push(4)); | may outlive borrowed value `books` help: to force the closure to take ownership of `books` (and any other referenced variables), use the `move` keyword | -23 | spawn(move || books.push(4)); +LL | spawn(move || books.push(4)); | ^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr index d5c7274dbf1..5de31c3ac35 100644 --- a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr +++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr @@ -7,7 +7,7 @@ LL | Box::new(|| books.push(4)) | may outlive borrowed value `books` help: to force the closure to take ownership of `books` (and any other referenced variables), use the `move` keyword | -21 | Box::new(move || books.push(4)) +LL | Box::new(move || books.push(4)) | ^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/borrowck/borrowck-move-error-with-note.stderr b/src/test/ui/borrowck/borrowck-move-error-with-note.stderr index 8b2e6c7f45a..acc78f4ab32 100644 --- a/src/test/ui/borrowck/borrowck-move-error-with-note.stderr +++ b/src/test/ui/borrowck/borrowck-move-error-with-note.stderr @@ -3,7 +3,7 @@ error[E0507]: cannot move out of borrowed content | LL | match *f { //~ ERROR cannot move out of | ^^ cannot move out of borrowed content -22 | //~| cannot move out +LL | //~| cannot move out LL | Foo::Foo1(num1, | ---- hint: to prevent move, use `ref num1` or `ref mut num1` LL | num2) => (), @@ -28,7 +28,7 @@ error[E0507]: cannot move out of borrowed content | LL | match a.a { //~ ERROR cannot move out of | ^ cannot move out of borrowed content -58 | //~| cannot move out +LL | //~| cannot move out LL | n => { | - hint: to prevent move, use `ref n` or `ref mut n` diff --git a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr index 583c273a2bf..01899446f48 100644 --- a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr +++ b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr @@ -3,10 +3,10 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as muta | LL | let y = &mut x; | - mutable borrow occurs here -16 | //~^ mutable borrow occurs here +LL | //~^ mutable borrow occurs here LL | let z = &x; //~ ERROR cannot borrow | ^ immutable borrow occurs here -18 | //~^ immutable borrow occurs here +LL | //~^ immutable borrow occurs here LL | } | - mutable borrow ends here @@ -15,10 +15,10 @@ error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immuta | LL | let y = &x; | - immutable borrow occurs here -27 | //~^ immutable borrow occurs here +LL | //~^ immutable borrow occurs here LL | let z = &mut x; //~ ERROR cannot borrow | ^ mutable borrow occurs here -29 | //~^ mutable borrow occurs here +LL | //~^ mutable borrow occurs here LL | } | - immutable borrow ends here @@ -27,10 +27,10 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time | LL | let y = &mut x; | - first mutable borrow occurs here -40 | //~^ first mutable borrow occurs here +LL | //~^ first mutable borrow occurs here LL | let z = &mut x; //~ ERROR cannot borrow | ^ second mutable borrow occurs here -42 | //~^ second mutable borrow occurs here +LL | //~^ second mutable borrow occurs here LL | }; | - first borrow ends here diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr index 82d22ee4e66..3d9fbc80038 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr @@ -3,7 +3,7 @@ error[E0506]: cannot assign to `vec[..]` because it is borrowed | LL | [box ref _a, _, _] => { | ------ borrow of `vec[..]` occurs here -20 | //~^ borrow of `vec[..]` occurs here +LL | //~^ borrow of `vec[..]` occurs here LL | vec[0] = box 4; //~ ERROR cannot assign | ^^^^^^^^^^^^^^ assignment to borrowed `vec[..]` occurs here @@ -12,7 +12,7 @@ error[E0506]: cannot assign to `vec[..]` because it is borrowed | LL | &mut [ref _b..] => { | ------ borrow of `vec[..]` occurs here -32 | //~^ borrow of `vec[..]` occurs here +LL | //~^ borrow of `vec[..]` occurs here LL | vec[0] = box 4; //~ ERROR cannot assign | ^^^^^^^^^^^^^^ assignment to borrowed `vec[..]` occurs here diff --git a/src/test/ui/borrowck/issue-41962.stderr b/src/test/ui/borrowck/issue-41962.stderr index cf1d46b777a..f0ee6b31f73 100644 --- a/src/test/ui/borrowck/issue-41962.stderr +++ b/src/test/ui/borrowck/issue-41962.stderr @@ -26,7 +26,7 @@ LL | if let Some(thing) = maybe { LL | | //~^ ERROR use of partially moved value: `maybe` (Ast) [E0382] LL | | //~| ERROR use of moved value: `(maybe as std::prelude::v1::Some).0` (Ast) [E0382] LL | | //~| ERROR use of moved value: `maybe` (Mir) [E0382] -21 | | //~| ERROR use of moved value: `maybe` (Mir) [E0382] +LL | | //~| ERROR use of moved value: `maybe` (Mir) [E0382] LL | | //~| ERROR use of moved value: `maybe.0` (Mir) [E0382] LL | | } | |_________^ value used here after move diff --git a/src/test/ui/borrowck/issue-7573.stderr b/src/test/ui/borrowck/issue-7573.stderr index 1f773e8ca2a..41a804adfe3 100644 --- a/src/test/ui/borrowck/issue-7573.stderr +++ b/src/test/ui/borrowck/issue-7573.stderr @@ -3,7 +3,7 @@ error: borrowed data cannot be stored outside of its closure | LL | let mut lines_to_use: Vec<&CrateId> = Vec::new(); | - cannot infer an appropriate lifetime... -28 | //~^ NOTE cannot infer an appropriate lifetime +LL | //~^ NOTE cannot infer an appropriate lifetime LL | let push_id = |installed_id: &CrateId| { | ------- ------------------------ borrowed data cannot outlive this closure | | diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.stderr b/src/test/ui/borrowck/mut-borrow-in-loop.stderr index aa75382e319..9b777246861 100644 --- a/src/test/ui/borrowck/mut-borrow-in-loop.stderr +++ b/src/test/ui/borrowck/mut-borrow-in-loop.stderr @@ -3,7 +3,7 @@ error[E0499]: cannot borrow `*arg` as mutable more than once at a time | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop -21 | } +LL | } LL | } | - mutable borrow ends here @@ -12,7 +12,7 @@ error[E0499]: cannot borrow `*arg` as mutable more than once at a time | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop -27 | } +LL | } LL | } | - mutable borrow ends here @@ -21,7 +21,7 @@ error[E0499]: cannot borrow `*arg` as mutable more than once at a time | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop -34 | } +LL | } LL | } | - mutable borrow ends here diff --git a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr index 0b66fd00488..d07bdab087c 100644 --- a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr +++ b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr @@ -3,7 +3,7 @@ error[E0507]: cannot move out of captured outer variable in an `Fn` closure | LL | let y = vec![format!("World")]; | - captured outer variable -20 | call(|| { +LL | call(|| { LL | y.into_iter(); | ^ cannot move out of captured outer variable in an `Fn` closure diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/src/test/ui/codemap_tests/tab_3.stderr index 02cbf5afee6..c2826359e08 100644 --- a/src/test/ui/codemap_tests/tab_3.stderr +++ b/src/test/ui/codemap_tests/tab_3.stderr @@ -3,7 +3,7 @@ error[E0382]: use of moved value: `some_vec` | LL | some_vec.into_iter(); | -------- value moved here -16 | { +LL | { LL | println!("{:?}", some_vec); //~ ERROR use of moved | ^^^^^^^^ value used here after move | diff --git a/src/test/ui/coherence-overlap-downstream-inherent.stderr b/src/test/ui/coherence-overlap-downstream-inherent.stderr index 17cb53070e9..ec315d897ac 100644 --- a/src/test/ui/coherence-overlap-downstream-inherent.stderr +++ b/src/test/ui/coherence-overlap-downstream-inherent.stderr @@ -3,7 +3,7 @@ error[E0592]: duplicate definitions with name `dummy` | LL | impl<T:Sugar> Sweet<T> { fn dummy(&self) { } } | ^^^^^^^^^^^^^^^^^^^ duplicate definitions for `dummy` -18 | //~^ ERROR E0592 +LL | //~^ ERROR E0592 LL | impl<T:Fruit> Sweet<T> { fn dummy(&self) { } } | ------------------- other definition for `dummy` @@ -12,7 +12,7 @@ error[E0592]: duplicate definitions with name `f` | LL | impl<X, T> A<T, X> where T: Bar<X> { fn f(&self) {} } | ^^^^^^^^^^^^^^ duplicate definitions for `f` -24 | //~^ ERROR E0592 +LL | //~^ ERROR E0592 LL | impl<X> A<i32, X> { fn f(&self) {} } | -------------- other definition for `f` | diff --git a/src/test/ui/coherence-overlap-issue-23516-inherent.stderr b/src/test/ui/coherence-overlap-issue-23516-inherent.stderr index 30d83881b36..6bb73e6d383 100644 --- a/src/test/ui/coherence-overlap-issue-23516-inherent.stderr +++ b/src/test/ui/coherence-overlap-issue-23516-inherent.stderr @@ -3,7 +3,7 @@ error[E0592]: duplicate definitions with name `dummy` | LL | impl<T:Sugar> Cake<T> { fn dummy(&self) { } } | ^^^^^^^^^^^^^^^^^^^ duplicate definitions for `dummy` -20 | //~^ ERROR E0592 +LL | //~^ ERROR E0592 LL | impl<U:Sugar> Cake<Box<U>> { fn dummy(&self) { } } | ------------------- other definition for `dummy` | diff --git a/src/test/ui/coherence-overlap-upstream-inherent.stderr b/src/test/ui/coherence-overlap-upstream-inherent.stderr index d7df8c7f7b3..a7a6003b06c 100644 --- a/src/test/ui/coherence-overlap-upstream-inherent.stderr +++ b/src/test/ui/coherence-overlap-upstream-inherent.stderr @@ -3,7 +3,7 @@ error[E0592]: duplicate definitions with name `dummy` | LL | impl<T> A<T> where T: Remote { fn dummy(&self) { } } | ^^^^^^^^^^^^^^^^^^^ duplicate definitions for `dummy` -22 | //~^ ERROR E0592 +LL | //~^ ERROR E0592 LL | impl A<i16> { fn dummy(&self) { } } | ------------------- other definition for `dummy` | diff --git a/src/test/ui/did_you_mean/issue-39544.stderr b/src/test/ui/did_you_mean/issue-39544.stderr index 164aaf1a7ed..a05b70b2eb8 100644 --- a/src/test/ui/did_you_mean/issue-39544.stderr +++ b/src/test/ui/did_you_mean/issue-39544.stderr @@ -27,7 +27,7 @@ error[E0596]: cannot borrow field `other.x` of immutable binding as mutable | LL | fn foo1(&self, other: &Z) { | -- use `&mut Z` here to make mutable -30 | let _ = &mut self.x; //~ ERROR cannot borrow +LL | let _ = &mut self.x; //~ ERROR cannot borrow LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^ cannot mutably borrow field of immutable binding @@ -44,7 +44,7 @@ error[E0596]: cannot borrow field `other.x` of immutable binding as mutable | LL | fn foo2<'a>(&'a self, other: &Z) { | -- use `&mut Z` here to make mutable -35 | let _ = &mut self.x; //~ ERROR cannot borrow +LL | let _ = &mut self.x; //~ ERROR cannot borrow LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^ cannot mutably borrow field of immutable binding @@ -61,7 +61,7 @@ error[E0596]: cannot borrow field `other.x` of immutable binding as mutable | LL | fn foo3<'a>(self: &'a Self, other: &Z) { | -- use `&mut Z` here to make mutable -40 | let _ = &mut self.x; //~ ERROR cannot borrow +LL | let _ = &mut self.x; //~ ERROR cannot borrow LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^ cannot mutably borrow field of immutable binding @@ -86,7 +86,7 @@ error[E0596]: cannot borrow field `w.x` of immutable binding as mutable | LL | pub fn with_arg(z: Z, w: &Z) { | -- use `&mut Z` here to make mutable -51 | let _ = &mut z.x; //~ ERROR cannot borrow +LL | let _ = &mut z.x; //~ ERROR cannot borrow LL | let _ = &mut w.x; //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding diff --git a/src/test/ui/did_you_mean/issue-42764.stderr b/src/test/ui/did_you_mean/issue-42764.stderr index 0716436d0fd..390b214e62e 100644 --- a/src/test/ui/did_you_mean/issue-42764.stderr +++ b/src/test/ui/did_you_mean/issue-42764.stderr @@ -8,9 +8,9 @@ LL | this_function_expects_a_double_option(n); found type `usize` help: try using a variant of the expected type | -21 | this_function_expects_a_double_option(DoubleOption::FirstSome(n)); +LL | this_function_expects_a_double_option(DoubleOption::FirstSome(n)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ -21 | this_function_expects_a_double_option(DoubleOption::AlternativeSome(n)); +LL | this_function_expects_a_double_option(DoubleOption::AlternativeSome(n)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/double-import.stderr b/src/test/ui/double-import.stderr index 118c7d48494..ceddff4047b 100644 --- a/src/test/ui/double-import.stderr +++ b/src/test/ui/double-import.stderr @@ -9,7 +9,7 @@ LL | use sub2::foo; //~ ERROR the name `foo` is defined multiple times = note: `foo` must be defined only once in the value namespace of this module help: You can use `as` to change the binding name of the import | -23 | use sub2::foo as other_foo; //~ ERROR the name `foo` is defined multiple times +LL | use sub2::foo as other_foo; //~ ERROR the name `foo` is defined multiple times | ^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr b/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr index af3738d5784..d5b4e85ce5e 100644 --- a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr +++ b/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr @@ -5,7 +5,7 @@ LL | / impl<#[may_dangle] A, B: fmt::Debug> Drop for Pt<A, B> { LL | | //~^ ERROR requires an `unsafe impl` declaration due to `#[may_dangle]` attribute LL | | LL | | // (unsafe to access self.1 due to #[may_dangle] on A) -36 | | fn drop(&mut self) { println!("drop {} {:?}", self.0, self.2); } +LL | | fn drop(&mut self) { println!("drop {} {:?}", self.0, self.2); } LL | | } | |_^ @@ -16,7 +16,7 @@ LL | / impl<#[may_dangle] 'a, 'b, B: fmt::Debug> Drop for Pr<'a, 'b, B> { LL | | //~^ ERROR requires an `unsafe impl` declaration due to `#[may_dangle]` attribute LL | | LL | | // (unsafe to access self.1 due to #[may_dangle] on 'a) -42 | | fn drop(&mut self) { println!("drop {} {:?}", self.0, self.2); } +LL | | fn drop(&mut self) { println!("drop {} {:?}", self.0, self.2); } LL | | } | |_^ diff --git a/src/test/ui/empty-struct-unit-expr.stderr b/src/test/ui/empty-struct-unit-expr.stderr index 170121dfde3..e64f383f91b 100644 --- a/src/test/ui/empty-struct-unit-expr.stderr +++ b/src/test/ui/empty-struct-unit-expr.stderr @@ -17,7 +17,7 @@ LL | let e4 = E::Empty4(); | ^^^^^^^^^^^ not a function help: `E::Empty4` is a unit variant, you need to write it without the parenthesis | -26 | let e4 = E::Empty4; +LL | let e4 = E::Empty4; | ^^^^^^^^^ error[E0618]: expected function, found `empty_struct::XEmpty2` @@ -33,7 +33,7 @@ LL | let xe4 = XE::XEmpty4(); | ^^^^^^^^^^^^^ not a function help: `XE::XEmpty4` is a unit variant, you need to write it without the parenthesis | -29 | let xe4 = XE::XEmpty4; +LL | let xe4 = XE::XEmpty4; | ^^^^^^^^^^^ error: aborting due to 4 previous errors diff --git a/src/test/ui/error-codes/E0194.stderr b/src/test/ui/error-codes/E0194.stderr index d33ce009521..9447b90355e 100644 --- a/src/test/ui/error-codes/E0194.stderr +++ b/src/test/ui/error-codes/E0194.stderr @@ -3,7 +3,7 @@ error[E0194]: type parameter `T` shadows another type parameter of the same name | LL | trait Foo<T> { | - first `T` declared here -12 | fn do_something(&self) -> T; +LL | fn do_something(&self) -> T; LL | fn do_something_else<T: Clone>(&self, bar: T); | ^ shadows another type parameter diff --git a/src/test/ui/error-codes/E0221.stderr b/src/test/ui/error-codes/E0221.stderr index 735b31bc053..07ce53e3b58 100644 --- a/src/test/ui/error-codes/E0221.stderr +++ b/src/test/ui/error-codes/E0221.stderr @@ -6,7 +6,7 @@ LL | type A: T1; ... LL | type A: T2; | ----------- ambiguous `A` from `Bar` -20 | fn do_something() { +LL | fn do_something() { LL | let _: Self::A; | ^^^^^^^ ambiguous associated type `A` @@ -15,7 +15,7 @@ error[E0221]: ambiguous associated type `Err` in bounds of `Self` | LL | type Err: T3; | ------------- ambiguous `Err` from `My` -30 | fn test() { +LL | fn test() { LL | let _: Self::Err; | ^^^^^^^^^ ambiguous associated type `Err` | diff --git a/src/test/ui/error-codes/E0252.stderr b/src/test/ui/error-codes/E0252.stderr index 038e8b13f03..8186c4590f0 100644 --- a/src/test/ui/error-codes/E0252.stderr +++ b/src/test/ui/error-codes/E0252.stderr @@ -9,7 +9,7 @@ LL | use bar::baz; //~ ERROR E0252 = note: `baz` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -12 | use bar::baz as other_baz; //~ ERROR E0252 +LL | use bar::baz as other_baz; //~ ERROR E0252 | ^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/error-codes/E0254.stderr b/src/test/ui/error-codes/E0254.stderr index 71d9f3b9490..f1e1b56a790 100644 --- a/src/test/ui/error-codes/E0254.stderr +++ b/src/test/ui/error-codes/E0254.stderr @@ -10,7 +10,7 @@ LL | use foo::alloc; = note: `alloc` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -22 | use foo::alloc as other_alloc; +LL | use foo::alloc as other_alloc; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/error-codes/E0255.stderr b/src/test/ui/error-codes/E0255.stderr index 31d237499aa..4d4053b1fb6 100644 --- a/src/test/ui/error-codes/E0255.stderr +++ b/src/test/ui/error-codes/E0255.stderr @@ -3,14 +3,14 @@ error[E0255]: the name `foo` is defined multiple times | LL | use bar::foo; | -------- previous import of the value `foo` here -12 | +LL | LL | fn foo() {} //~ ERROR E0255 | ^^^^^^^^ `foo` redefined here | = note: `foo` must be defined only once in the value namespace of this module help: You can use `as` to change the binding name of the import | -11 | use bar::foo as other_foo; +LL | use bar::foo as other_foo; | ^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/error-codes/E0259.stderr b/src/test/ui/error-codes/E0259.stderr index 21c327ceba1..2cdd9aa6683 100644 --- a/src/test/ui/error-codes/E0259.stderr +++ b/src/test/ui/error-codes/E0259.stderr @@ -3,7 +3,7 @@ error[E0259]: the name `alloc` is defined multiple times | LL | extern crate alloc; | ------------------- previous import of the extern crate `alloc` here -15 | +LL | LL | extern crate libc as alloc; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | | diff --git a/src/test/ui/error-codes/E0260.stderr b/src/test/ui/error-codes/E0260.stderr index bcf92e85630..a249c80ea2c 100644 --- a/src/test/ui/error-codes/E0260.stderr +++ b/src/test/ui/error-codes/E0260.stderr @@ -3,14 +3,14 @@ error[E0260]: the name `alloc` is defined multiple times | LL | extern crate alloc; | ------------------- previous import of the extern crate `alloc` here -15 | +LL | LL | mod alloc { | ^^^^^^^^^ `alloc` redefined here | = note: `alloc` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -14 | extern crate alloc as other_alloc; +LL | extern crate alloc as other_alloc; | error: aborting due to previous error diff --git a/src/test/ui/error-codes/E0430.stderr b/src/test/ui/error-codes/E0430.stderr index bdff2dd3b2f..b6448ec18c3 100644 --- a/src/test/ui/error-codes/E0430.stderr +++ b/src/test/ui/error-codes/E0430.stderr @@ -17,7 +17,7 @@ LL | use std::fmt::{self, self}; //~ ERROR E0430 = note: `fmt` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -11 | use std::fmt::{self, self as other_fmt}; //~ ERROR E0430 +LL | use std::fmt::{self, self as other_fmt}; //~ ERROR E0430 | ^^^^^^^^^^^^^^^^^ error: aborting due to 2 previous errors diff --git a/src/test/ui/error-codes/E0453.stderr b/src/test/ui/error-codes/E0453.stderr index cb08dd3d7bd..646b98b8473 100644 --- a/src/test/ui/error-codes/E0453.stderr +++ b/src/test/ui/error-codes/E0453.stderr @@ -3,7 +3,7 @@ error[E0453]: allow(non_snake_case) overruled by outer forbid(non_snake_case) | LL | #![forbid(non_snake_case)] | -------------- `forbid` level set here -12 | +LL | LL | #[allow(non_snake_case)] | ^^^^^^^^^^^^^^ overruled by previous forbid diff --git a/src/test/ui/error-codes/E0597.stderr b/src/test/ui/error-codes/E0597.stderr index d0676019687..41035493bfc 100644 --- a/src/test/ui/error-codes/E0597.stderr +++ b/src/test/ui/error-codes/E0597.stderr @@ -3,7 +3,7 @@ error[E0597]: `y` does not live long enough | LL | x.x = Some(&y); | ^ borrowed value does not live long enough -19 | //~^ `y` does not live long enough [E0597] +LL | //~^ `y` does not live long enough [E0597] LL | } | - `y` dropped here while still borrowed | diff --git a/src/test/ui/error-codes/E0617.stderr b/src/test/ui/error-codes/E0617.stderr index e9fa58e3cf7..11b1bf32ee0 100644 --- a/src/test/ui/error-codes/E0617.stderr +++ b/src/test/ui/error-codes/E0617.stderr @@ -35,7 +35,7 @@ LL | printf(::std::ptr::null(), printf); | ^^^^^^ help: cast the value to `unsafe extern "C" fn(*const i8, ...)` | -34 | printf(::std::ptr::null(), printf as unsafe extern "C" fn(*const i8, ...)); +LL | printf(::std::ptr::null(), printf as unsafe extern "C" fn(*const i8, ...)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to 6 previous errors diff --git a/src/test/ui/error-codes/E0618.stderr b/src/test/ui/error-codes/E0618.stderr index 020bd281b78..41ef37dca54 100644 --- a/src/test/ui/error-codes/E0618.stderr +++ b/src/test/ui/error-codes/E0618.stderr @@ -8,7 +8,7 @@ LL | X::Entry(); | ^^^^^^^^^^ not a function help: `X::Entry` is a unit variant, you need to write it without the parenthesis | -16 | X::Entry; +LL | X::Entry; | ^^^^^^^^ error[E0618]: expected function, found `i32` diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr index 79383876707..40a81171a89 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr @@ -5,7 +5,7 @@ error[E0518]: attribute should be applied to function | LL | #[inline = "2100"] | ^^^^^^^^^^^^^^^^^^ -22 | //~^ ERROR attribute should be applied to function +LL | //~^ ERROR attribute should be applied to function LL | / mod inline { LL | | mod inner { #![inline="2100"] } LL | | //~^ ERROR attribute should be applied to function diff --git a/src/test/ui/generator/borrowing.stderr b/src/test/ui/generator/borrowing.stderr index b60e90dbf36..a27d950c045 100644 --- a/src/test/ui/generator/borrowing.stderr +++ b/src/test/ui/generator/borrowing.stderr @@ -5,7 +5,7 @@ LL | (|| yield &a).resume() | -- ^ borrowed value does not live long enough | | | capture occurs here -19 | //~^ ERROR: `a` does not live long enough +LL | //~^ ERROR: `a` does not live long enough LL | }; | - borrowed value only lives until here ... diff --git a/src/test/ui/generator/dropck.stderr b/src/test/ui/generator/dropck.stderr index 1c4ee560ff6..c4ae9051138 100644 --- a/src/test/ui/generator/dropck.stderr +++ b/src/test/ui/generator/dropck.stderr @@ -3,7 +3,7 @@ error[E0597]: `ref_` does not live long enough | LL | gen = || { | -- capture occurs here -22 | // but the generator can use it to drop a `Ref<'a, i32>`. +LL | // but the generator can use it to drop a `Ref<'a, i32>`. LL | let _d = ref_.take(); //~ ERROR `ref_` does not live long enough | ^^^^ borrowed value does not live long enough ... diff --git a/src/test/ui/generator/generator-with-nll.stderr b/src/test/ui/generator/generator-with-nll.stderr index b97131c8166..49542dd0ac3 100644 --- a/src/test/ui/generator/generator-with-nll.stderr +++ b/src/test/ui/generator/generator-with-nll.stderr @@ -12,7 +12,7 @@ error[E0626]: borrow may still be in use when generator yields (Ast) | LL | let b = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast) | ^^^^ -21 | //~^ borrow may still be in use when generator yields (Mir) +LL | //~^ borrow may still be in use when generator yields (Mir) LL | yield (); | -------- possible yield occurs here @@ -21,7 +21,7 @@ error[E0626]: borrow may still be in use when generator yields (Mir) | LL | let b = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast) | ^^^^^^^^^ -21 | //~^ borrow may still be in use when generator yields (Mir) +LL | //~^ borrow may still be in use when generator yields (Mir) LL | yield (); | -------- possible yield occurs here diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr index c2af17d97e6..7cd07adf0b1 100644 --- a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr +++ b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr @@ -3,7 +3,7 @@ error[E0597]: `b` does not live long enough | LL | a = &b; | ^ borrowed value does not live long enough -25 | //~^ ERROR `b` does not live long enough +LL | //~^ ERROR `b` does not live long enough LL | }; | - `b` dropped here while still borrowed LL | } diff --git a/src/test/ui/generator/yield-while-iterating.stderr b/src/test/ui/generator/yield-while-iterating.stderr index c7d57f60313..c1a047f6c2a 100644 --- a/src/test/ui/generator/yield-while-iterating.stderr +++ b/src/test/ui/generator/yield-while-iterating.stderr @@ -16,7 +16,7 @@ LL | for p in &mut x { ... LL | println!("{}", x[0]); //~ ERROR | ^ immutable borrow occurs here -68 | b.resume(); +LL | b.resume(); LL | } | - mutable borrow ends here diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.stderr b/src/test/ui/generator/yield-while-ref-reborrowed.stderr index 01222444ca4..57d688e78f6 100644 --- a/src/test/ui/generator/yield-while-ref-reborrowed.stderr +++ b/src/test/ui/generator/yield-while-ref-reborrowed.stderr @@ -8,7 +8,7 @@ LL | let a = &mut *x; ... LL | println!("{}", x); //~ ERROR | ^ borrow occurs here -46 | b.resume(); +LL | b.resume(); LL | } | - borrow from closure ends here diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.stderr b/src/test/ui/impl-trait/no-method-suggested-traits.stderr index d721c2ef686..d5250b42cc2 100644 --- a/src/test/ui/impl-trait/no-method-suggested-traits.stderr +++ b/src/test/ui/impl-trait/no-method-suggested-traits.stderr @@ -7,13 +7,13 @@ LL | 1u32.method(); = help: items from traits can only be used if the trait is in scope help: the following traits are implemented but not in scope, perhaps add a `use` for one of them: | -14 | use foo::Bar; +LL | use foo::Bar; | -14 | use no_method_suggested_traits::foo::PubPub; +LL | use no_method_suggested_traits::foo::PubPub; | -14 | use no_method_suggested_traits::qux::PrivPub; +LL | use no_method_suggested_traits::qux::PrivPub; | -14 | use no_method_suggested_traits::Reexported; +LL | use no_method_suggested_traits::Reexported; | error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&u32>>` in the current scope @@ -25,13 +25,13 @@ LL | std::rc::Rc::new(&mut Box::new(&1u32)).method(); = help: items from traits can only be used if the trait is in scope help: the following traits are implemented but not in scope, perhaps add a `use` for one of them: | -14 | use foo::Bar; +LL | use foo::Bar; | -14 | use no_method_suggested_traits::foo::PubPub; +LL | use no_method_suggested_traits::foo::PubPub; | -14 | use no_method_suggested_traits::qux::PrivPub; +LL | use no_method_suggested_traits::qux::PrivPub; | -14 | use no_method_suggested_traits::Reexported; +LL | use no_method_suggested_traits::Reexported; | error[E0599]: no method named `method` found for type `char` in the current scope @@ -43,7 +43,7 @@ LL | 'a'.method(); = help: items from traits can only be used if the trait is in scope help: the following trait is implemented but not in scope, perhaps add a `use` for it: | -14 | use foo::Bar; +LL | use foo::Bar; | error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&char>>` in the current scope @@ -55,7 +55,7 @@ LL | std::rc::Rc::new(&mut Box::new(&'a')).method(); = help: items from traits can only be used if the trait is in scope help: the following trait is implemented but not in scope, perhaps add a `use` for it: | -14 | use foo::Bar; +LL | use foo::Bar; | error[E0599]: no method named `method` found for type `i32` in the current scope @@ -67,7 +67,7 @@ LL | 1i32.method(); = help: items from traits can only be used if the trait is in scope help: the following trait is implemented but not in scope, perhaps add a `use` for it: | -14 | use no_method_suggested_traits::foo::PubPub; +LL | use no_method_suggested_traits::foo::PubPub; | error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&i32>>` in the current scope @@ -79,7 +79,7 @@ LL | std::rc::Rc::new(&mut Box::new(&1i32)).method(); = help: items from traits can only be used if the trait is in scope help: the following trait is implemented but not in scope, perhaps add a `use` for it: | -14 | use no_method_suggested_traits::foo::PubPub; +LL | use no_method_suggested_traits::foo::PubPub; | error[E0599]: no method named `method` found for type `Foo` in the current scope diff --git a/src/test/ui/impl-trait/universal_wrong_bounds.stderr b/src/test/ui/impl-trait/universal_wrong_bounds.stderr index 65a88f57596..6cf0baa5fcc 100644 --- a/src/test/ui/impl-trait/universal_wrong_bounds.stderr +++ b/src/test/ui/impl-trait/universal_wrong_bounds.stderr @@ -11,7 +11,7 @@ LL | fn wants_debug(g: impl Debug) { } //~ ERROR cannot find | ^^^^^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -13 | use std::fmt::Debug; +LL | use std::fmt::Debug; | error[E0405]: cannot find trait `Debug` in this scope @@ -21,7 +21,7 @@ LL | fn wants_display(g: impl Debug) { } //~ ERROR cannot find | ^^^^^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -13 | use std::fmt::Debug; +LL | use std::fmt::Debug; | error: cannot continue compilation due to previous error diff --git a/src/test/ui/imports/duplicate.stderr b/src/test/ui/imports/duplicate.stderr index d2342bece4f..0715674077a 100644 --- a/src/test/ui/imports/duplicate.stderr +++ b/src/test/ui/imports/duplicate.stderr @@ -9,7 +9,7 @@ LL | use a::foo; //~ ERROR the name `foo` is defined multiple times = note: `foo` must be defined only once in the value namespace of this module help: You can use `as` to change the binding name of the import | -25 | use a::foo as other_foo; //~ ERROR the name `foo` is defined multiple times +LL | use a::foo as other_foo; //~ ERROR the name `foo` is defined multiple times | ^^^^^^^^^^^^^^^^^^^ error[E0659]: `foo` is ambiguous diff --git a/src/test/ui/imports/shadow_builtin_macros.stderr b/src/test/ui/imports/shadow_builtin_macros.stderr index cf23230720c..8c72d27d6aa 100644 --- a/src/test/ui/imports/shadow_builtin_macros.stderr +++ b/src/test/ui/imports/shadow_builtin_macros.stderr @@ -3,7 +3,7 @@ error: `panic` is already in scope | LL | macro_rules! panic { () => {} } //~ ERROR `panic` is already in scope | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -43 | } } +LL | } } LL | m!(); | ----- in this macro invocation | diff --git a/src/test/ui/in-band-lifetimes/shadow.stderr b/src/test/ui/in-band-lifetimes/shadow.stderr index ea33c379f09..b22b18aa929 100644 --- a/src/test/ui/in-band-lifetimes/shadow.stderr +++ b/src/test/ui/in-band-lifetimes/shadow.stderr @@ -11,7 +11,7 @@ error[E0496]: lifetime name `'s` shadows a lifetime name that is already in scop | LL | impl Foo<&'s u8> { | -- first declared here -17 | fn bar<'s>(&self, x: &'s u8) {} //~ ERROR shadows a lifetime name +LL | fn bar<'s>(&self, x: &'s u8) {} //~ ERROR shadows a lifetime name LL | fn baz(x: for<'s> fn(&'s u32)) {} //~ ERROR shadows a lifetime name | ^^ lifetime 's already in scope diff --git a/src/test/ui/issue-13058.stderr b/src/test/ui/issue-13058.stderr index 387f3459e16..30936d4c90d 100644 --- a/src/test/ui/issue-13058.stderr +++ b/src/test/ui/issue-13058.stderr @@ -3,7 +3,7 @@ error[E0621]: explicit lifetime required in the type of `cont` | LL | fn check<'r, I: Iterator<Item=usize>, T: Itble<'r, usize, I>>(cont: &T) -> bool | ---- consider changing the type of `cont` to `&'r T` -23 | { +LL | { LL | let cont_iter = cont.iter(); | ^^^^ lifetime `'r` required diff --git a/src/test/ui/issue-17263.stderr b/src/test/ui/issue-17263.stderr index e1df4de11fe..e321a9f4562 100644 --- a/src/test/ui/issue-17263.stderr +++ b/src/test/ui/issue-17263.stderr @@ -16,7 +16,7 @@ LL | let (c, d) = (&mut foo.a, &foo.b); | ----- ^^^^^ immutable borrow occurs here (via `foo.b`) | | | mutable borrow occurs here (via `foo.a`) -22 | //~^ ERROR cannot borrow `foo` (via `foo.b`) as immutable +LL | //~^ ERROR cannot borrow `foo` (via `foo.b`) as immutable LL | } | - mutable borrow ends here diff --git a/src/test/ui/issue-19498.stderr b/src/test/ui/issue-19498.stderr index 1d0490159a2..b2793dff2bf 100644 --- a/src/test/ui/issue-19498.stderr +++ b/src/test/ui/issue-19498.stderr @@ -3,14 +3,14 @@ error[E0255]: the name `A` is defined multiple times | LL | use self::A; | ------- previous import of the module `A` here -12 | use self::B; +LL | use self::B; LL | mod A {} //~ ERROR the name `A` is defined multiple times | ^^^^^ `A` redefined here | = note: `A` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -11 | use self::A as OtherA; +LL | use self::A as OtherA; | ^^^^^^^^^^^^^^^^^ error[E0255]: the name `B` is defined multiple times @@ -25,7 +25,7 @@ LL | pub mod B {} //~ ERROR the name `B` is defined multiple times = note: `B` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -12 | use self::B as OtherB; +LL | use self::B as OtherB; | ^^^^^^^^^^^^^^^^^ error[E0255]: the name `D` is defined multiple times @@ -39,7 +39,7 @@ LL | mod D {} //~ ERROR the name `D` is defined multiple times = note: `D` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -18 | use C::D as OtherD; +LL | use C::D as OtherD; | ^^^^^^^^^^^^^^ error: aborting due to 3 previous errors diff --git a/src/test/ui/issue-22644.stderr b/src/test/ui/issue-22644.stderr index afb49d77b5e..d5e87f89417 100644 --- a/src/test/ui/issue-22644.stderr +++ b/src/test/ui/issue-22644.stderr @@ -52,9 +52,9 @@ LL | 4); | - interpreted as generic arguments help: try comparing the casted value | -25 | println!("{}", (a -26 | as -27 | usize) +LL | println!("{}", (a +LL | as +LL | usize) | error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison @@ -66,12 +66,12 @@ LL | 5); | - interpreted as generic arguments help: try comparing the casted value | -30 | println!("{}", (a -31 | -32 | -33 | as -34 | -35 | +LL | println!("{}", (a +LL | +LL | +LL | as +LL | +LL | ... error: `<` is interpreted as a start of generic arguments for `usize`, not a shift diff --git a/src/test/ui/issue-23716.stderr b/src/test/ui/issue-23716.stderr index b9fd4354b82..739c8d66e71 100644 --- a/src/test/ui/issue-23716.stderr +++ b/src/test/ui/issue-23716.stderr @@ -3,7 +3,7 @@ error[E0530]: function parameters cannot shadow statics | LL | static foo: i32 = 0; | -------------------- a static `foo` is defined here -12 | +LL | LL | fn bar(foo: i32) {} | ^^^ cannot be named the same as a static @@ -12,7 +12,7 @@ error[E0530]: function parameters cannot shadow statics | LL | use self::submod::answer; | -------------------- a static `answer` is imported here -22 | +LL | LL | fn question(answer: i32) {} | ^^^^^^ cannot be named the same as a static diff --git a/src/test/ui/issue-24036.stderr b/src/test/ui/issue-24036.stderr index 5d067fe4b9d..bbf64d8305d 100644 --- a/src/test/ui/issue-24036.stderr +++ b/src/test/ui/issue-24036.stderr @@ -18,7 +18,7 @@ LL | | //~^ ERROR match arms have incompatible types LL | | 1 => |c| c + 1, LL | | 2 => |c| c - 1, | | --------- match arm with an incompatible type -22 | | _ => |c| c - 1 +LL | | _ => |c| c - 1 LL | | }; | |_____^ expected closure, found a different closure | diff --git a/src/test/ui/issue-24081.stderr b/src/test/ui/issue-24081.stderr index f2459893a5e..257e32f9198 100644 --- a/src/test/ui/issue-24081.stderr +++ b/src/test/ui/issue-24081.stderr @@ -10,7 +10,7 @@ LL | type Add = bool; //~ ERROR the name `Add` is defined multiple times = note: `Add` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -11 | use std::ops::Add as OtherAdd; +LL | use std::ops::Add as OtherAdd; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Sub` is defined multiple times @@ -25,7 +25,7 @@ LL | struct Sub { x: f32 } //~ ERROR the name `Sub` is defined multiple times = note: `Sub` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -12 | use std::ops::Sub as OtherSub; +LL | use std::ops::Sub as OtherSub; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Mul` is defined multiple times @@ -40,7 +40,7 @@ LL | enum Mul { A, B } //~ ERROR the name `Mul` is defined multiple times = note: `Mul` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -13 | use std::ops::Mul as OtherMul; +LL | use std::ops::Mul as OtherMul; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Div` is defined multiple times @@ -55,7 +55,7 @@ LL | mod Div { } //~ ERROR the name `Div` is defined multiple times = note: `Div` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -14 | use std::ops::Div as OtherDiv; +LL | use std::ops::Div as OtherDiv; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Rem` is defined multiple times @@ -70,7 +70,7 @@ LL | trait Rem { } //~ ERROR the name `Rem` is defined multiple times = note: `Rem` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -15 | use std::ops::Rem as OtherRem; +LL | use std::ops::Rem as OtherRem; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to 5 previous errors diff --git a/src/test/ui/issue-26886.stderr b/src/test/ui/issue-26886.stderr index 7fb2e09c3b6..dc812d1bae3 100644 --- a/src/test/ui/issue-26886.stderr +++ b/src/test/ui/issue-26886.stderr @@ -9,7 +9,7 @@ LL | use std::sync::Arc; //~ ERROR the name `Arc` is defined multiple times = note: `Arc` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -12 | use std::sync::Arc as OtherArc; //~ ERROR the name `Arc` is defined multiple times +LL | use std::sync::Arc as OtherArc; //~ ERROR the name `Arc` is defined multiple times | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0252]: the name `sync` is defined multiple times @@ -24,7 +24,7 @@ LL | use std::sync; //~ ERROR the name `sync` is defined multiple times = note: `sync` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -14 | use std::sync as other_sync; //~ ERROR the name `sync` is defined multiple times +LL | use std::sync as other_sync; //~ ERROR the name `sync` is defined multiple times | ^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to 2 previous errors diff --git a/src/test/ui/issue-30302.stderr b/src/test/ui/issue-30302.stderr index 1b53479301d..6528058428a 100644 --- a/src/test/ui/issue-30302.stderr +++ b/src/test/ui/issue-30302.stderr @@ -11,7 +11,7 @@ error: unreachable pattern | LL | Nil => true, | --- matches any value -24 | //~^ WARN pattern binding `Nil` is named the same as one of the variants of the type `Stack` +LL | //~^ WARN pattern binding `Nil` is named the same as one of the variants of the type `Stack` LL | _ => false | ^ unreachable pattern | diff --git a/src/test/ui/issue-35675.stderr b/src/test/ui/issue-35675.stderr index e15793473e3..84054b532de 100644 --- a/src/test/ui/issue-35675.stderr +++ b/src/test/ui/issue-35675.stderr @@ -14,7 +14,7 @@ LL | Apple(5) | ^^^^^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -12 | use Fruit::Apple; +LL | use Fruit::Apple; | error[E0573]: expected type, found variant `Fruit::Apple` @@ -33,7 +33,7 @@ LL | Apple(5) | ^^^^^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -12 | use Fruit::Apple; +LL | use Fruit::Apple; | error[E0573]: expected type, found variant `Ok` diff --git a/src/test/ui/issue-35976.stderr b/src/test/ui/issue-35976.stderr index ca972b2fe59..f97ba33dfd3 100644 --- a/src/test/ui/issue-35976.stderr +++ b/src/test/ui/issue-35976.stderr @@ -5,7 +5,7 @@ LL | arg.wait(); | ^^^^ help: another candidate was found in the following trait, perhaps add a `use` for it: | -11 | use private::Future; +LL | use private::Future; | error: aborting due to previous error diff --git a/src/test/ui/issue-3779.stderr b/src/test/ui/issue-3779.stderr index 12181c0ab56..6dcbabbe39a 100644 --- a/src/test/ui/issue-3779.stderr +++ b/src/test/ui/issue-3779.stderr @@ -3,7 +3,7 @@ error[E0072]: recursive type `S` has infinite size | LL | struct S { | ^^^^^^^^ recursive type has infinite size -12 | //~^ ERROR E0072 +LL | //~^ ERROR E0072 LL | element: Option<S> | ------------------ recursive without indirection | diff --git a/src/test/ui/issue-37884.stderr b/src/test/ui/issue-37884.stderr index 58c602900c9..d1f6cb7d922 100644 --- a/src/test/ui/issue-37884.stderr +++ b/src/test/ui/issue-37884.stderr @@ -5,7 +5,7 @@ LL | / fn next(&'a mut self) -> Option<Self::Item> LL | | //~^ ERROR method not compatible with trait LL | | //~| lifetime mismatch LL | | { -20 | | Some(&mut self.0) +LL | | Some(&mut self.0) LL | | } | |_____^ lifetime mismatch | @@ -18,7 +18,7 @@ LL | / fn next(&'a mut self) -> Option<Self::Item> LL | | //~^ ERROR method not compatible with trait LL | | //~| lifetime mismatch LL | | { -20 | | Some(&mut self.0) +LL | | Some(&mut self.0) LL | | } | |_____^ note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 13:1 diff --git a/src/test/ui/issue-41652/issue_41652.stderr b/src/test/ui/issue-41652/issue_41652.stderr index 1ee44ff2989..df7b8a6525f 100644 --- a/src/test/ui/issue-41652/issue_41652.stderr +++ b/src/test/ui/issue-41652/issue_41652.stderr @@ -5,7 +5,7 @@ LL | 3.f() | ^ help: you must specify a concrete type for this numeric value, like `i32` | -19 | 3_i32.f() +LL | 3_i32.f() | ^^^^^ error: aborting due to previous error diff --git a/src/test/ui/issue-4335.stderr b/src/test/ui/issue-4335.stderr index cbb299df4bd..90b94a597a5 100644 --- a/src/test/ui/issue-4335.stderr +++ b/src/test/ui/issue-4335.stderr @@ -7,7 +7,7 @@ LL | id(Box::new(|| *v)) | may outlive borrowed value `v` help: to force the closure to take ownership of `v` (and any other referenced variables), use the `move` keyword | -16 | id(Box::new(move || *v)) +LL | id(Box::new(move || *v)) | ^^^^^^^ error[E0507]: cannot move out of borrowed content diff --git a/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr b/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr index 27c5639b528..eaf7569100a 100644 --- a/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr +++ b/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr @@ -3,7 +3,7 @@ error: unnecessary `unsafe` block | LL | unsafe { | ------ because it's nested under this `unsafe` block -16 | let f = |v: &mut Vec<_>| { +LL | let f = |v: &mut Vec<_>| { LL | unsafe { //~ ERROR unnecessary `unsafe` | ^^^^^^ unnecessary `unsafe` block | diff --git a/src/test/ui/issue-47377.stderr b/src/test/ui/issue-47377.stderr index e9e05a131e0..2de117489c3 100644 --- a/src/test/ui/issue-47377.stderr +++ b/src/test/ui/issue-47377.stderr @@ -5,7 +5,7 @@ LL | let _a = b + ", World!"; | ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings help: `to_owned()` can be used to create an owned `String` from a string reference. String concatenation appends the string on the right to the string on the left and may require reallocation. This requires ownership of the string on the left | -13 | let _a = b.to_owned() + ", World!"; +LL | let _a = b.to_owned() + ", World!"; | ^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/issue-47380.stderr b/src/test/ui/issue-47380.stderr index ac87a6bc0b8..968dc614ad6 100644 --- a/src/test/ui/issue-47380.stderr +++ b/src/test/ui/issue-47380.stderr @@ -5,7 +5,7 @@ LL | println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!"; | ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings help: `to_owned()` can be used to create an owned `String` from a string reference. String concatenation appends the string on the right to the string on the left and may require reallocation. This requires ownership of the string on the left | -12 | println!("🦀🦀🦀🦀🦀"); let _a = b.to_owned() + ", World!"; +LL | println!("🦀🦀🦀🦀🦀"); let _a = b.to_owned() + ", World!"; | ^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/issue-4935.stderr b/src/test/ui/issue-4935.stderr index 15c1069816b..fb5a2261c1f 100644 --- a/src/test/ui/issue-4935.stderr +++ b/src/test/ui/issue-4935.stderr @@ -3,7 +3,7 @@ error[E0061]: this function takes 1 parameter but 2 parameters were supplied | LL | fn foo(a: usize) {} | ---------------- defined here -14 | //~^ defined here +LL | //~^ defined here LL | fn main() { foo(5, 6) } | ^^^^^^^^^ expected 1 parameter diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr index 9a254d0ba72..9efdb33f7e5 100644 --- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr +++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr @@ -3,7 +3,7 @@ error[E0621]: explicit lifetime required in the type of `x` | LL | fn foo<'a>(&'a self, x: &i32) -> &i32 { | - consider changing the type of `x` to `&'a i32` -17 | +LL | LL | if true { &self.field } else { x } //~ ERROR explicit lifetime | ^ lifetime `'a` required diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr index c109c977098..f27d869a4d4 100644 --- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr +++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr @@ -5,7 +5,7 @@ LL | fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { | ---- ------- | | | this parameter and the return type are declared with different lifetimes... -20 | +LL | LL | if x > y { x } else { y } //~ ERROR lifetime mismatch | ^ ...but data from `x` is returned here diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr index 08cf06bcbfb..c72d25fe2a9 100644 --- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr +++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr @@ -5,7 +5,7 @@ LL | fn foo<'a>(&self, x: &'a i32) -> &i32 { | ------- ---- | | | this parameter and the return type are declared with different lifetimes... -17 | +LL | LL | x //~ ERROR lifetime mismatch | ^ ...but data from `x` is returned here diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr index 9e96623f5b3..4d9e26c0632 100644 --- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr +++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr @@ -5,7 +5,7 @@ LL | fn foo<'a>(&self, x: &'a Foo) -> &'a Foo { | ----- ------- | | | this parameter and the return type are declared with different lifetimes... -17 | +LL | LL | if true { x } else { self } //~ ERROR lifetime mismatch | ^^^^ ...but data from `self` is returned here diff --git a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr b/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr index 6e6794ce37c..bba52f408b0 100644 --- a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr +++ b/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr @@ -3,7 +3,7 @@ error[E0623]: lifetime mismatch | LL | fn foo<'a, 'b, 'c>(x: &'a mut Vec<Ref<'b, i32>>, y: Ref<'c, i32>) { | ------------ ------------ these two types are declared with different lifetimes... -16 | let z = Ref { data: y.data }; +LL | let z = Ref { data: y.data }; LL | x.push(z); //~ ERROR lifetime mismatch | ^ ...but data from `y` flows into `x` here diff --git a/src/test/ui/lint-ctypes.stderr b/src/test/ui/lint-ctypes.stderr index 748c311055f..76b500e7d23 100644 --- a/src/test/ui/lint-ctypes.stderr +++ b/src/test/ui/lint-ctypes.stderr @@ -1,38 +1,38 @@ error: `extern` block uses type `Foo` which is not FFI-safe: this struct has unspecified layout --> $DIR/lint-ctypes.rs:54:28 | -54 | pub fn ptr_type1(size: *const Foo); //~ ERROR: uses type `Foo` +LL | pub fn ptr_type1(size: *const Foo); //~ ERROR: uses type `Foo` | ^^^^^^^^^^ | note: lint level defined here --> $DIR/lint-ctypes.rs:11:9 | -11 | #![deny(improper_ctypes)] +LL | #![deny(improper_ctypes)] | ^^^^^^^^^^^^^^^ = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here --> $DIR/lint-ctypes.rs:32:1 | -32 | pub struct Foo; +LL | pub struct Foo; | ^^^^^^^^^^^^^^^ error: `extern` block uses type `Foo` which is not FFI-safe: this struct has unspecified layout --> $DIR/lint-ctypes.rs:55:28 | -55 | pub fn ptr_type2(size: *const Foo); //~ ERROR: uses type `Foo` +LL | pub fn ptr_type2(size: *const Foo); //~ ERROR: uses type `Foo` | ^^^^^^^^^^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here --> $DIR/lint-ctypes.rs:32:1 | -32 | pub struct Foo; +LL | pub struct Foo; | ^^^^^^^^^^^^^^^ error: `extern` block uses type `[u32]` which is not FFI-safe: slices have no C equivalent --> $DIR/lint-ctypes.rs:56:26 | -56 | pub fn slice_type(p: &[u32]); //~ ERROR: uses type `[u32]` +LL | pub fn slice_type(p: &[u32]); //~ ERROR: uses type `[u32]` | ^^^^^^ | = help: consider using a raw pointer instead @@ -40,7 +40,7 @@ error: `extern` block uses type `[u32]` which is not FFI-safe: slices have no C error: `extern` block uses type `str` which is not FFI-safe: string slices have no C equivalent --> $DIR/lint-ctypes.rs:57:24 | -57 | pub fn str_type(p: &str); //~ ERROR: uses type `str` +LL | pub fn str_type(p: &str); //~ ERROR: uses type `str` | ^^^^ | = help: consider using `*const u8` and a length instead @@ -48,7 +48,7 @@ error: `extern` block uses type `str` which is not FFI-safe: string slices have error: `extern` block uses type `std::boxed::Box<u32>` which is not FFI-safe: this struct has unspecified layout --> $DIR/lint-ctypes.rs:58:24 | -58 | pub fn box_type(p: Box<u32>); //~ ERROR uses type `std::boxed::Box<u32>` +LL | pub fn box_type(p: Box<u32>); //~ ERROR uses type `std::boxed::Box<u32>` | ^^^^^^^^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct @@ -56,7 +56,7 @@ error: `extern` block uses type `std::boxed::Box<u32>` which is not FFI-safe: th error: `extern` block uses type `char` which is not FFI-safe: the `char` type has no C equivalent --> $DIR/lint-ctypes.rs:59:25 | -59 | pub fn char_type(p: char); //~ ERROR uses type `char` +LL | pub fn char_type(p: char); //~ ERROR uses type `char` | ^^^^ | = help: consider using `u32` or `libc::wchar_t` instead @@ -64,25 +64,25 @@ error: `extern` block uses type `char` which is not FFI-safe: the `char` type ha error: `extern` block uses type `i128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI --> $DIR/lint-ctypes.rs:60:25 | -60 | pub fn i128_type(p: i128); //~ ERROR uses type `i128` +LL | pub fn i128_type(p: i128); //~ ERROR uses type `i128` | ^^^^ error: `extern` block uses type `u128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI --> $DIR/lint-ctypes.rs:61:25 | -61 | pub fn u128_type(p: u128); //~ ERROR uses type `u128` +LL | pub fn u128_type(p: u128); //~ ERROR uses type `u128` | ^^^^ error: `extern` block uses type `std::clone::Clone` which is not FFI-safe: trait objects have no C equivalent --> $DIR/lint-ctypes.rs:62:26 | -62 | pub fn trait_type(p: &Clone); //~ ERROR uses type `std::clone::Clone` +LL | pub fn trait_type(p: &Clone); //~ ERROR uses type `std::clone::Clone` | ^^^^^^ error: `extern` block uses type `(i32, i32)` which is not FFI-safe: tuples have unspecified layout --> $DIR/lint-ctypes.rs:63:26 | -63 | pub fn tuple_type(p: (i32, i32)); //~ ERROR uses type `(i32, i32)` +LL | pub fn tuple_type(p: (i32, i32)); //~ ERROR uses type `(i32, i32)` | ^^^^^^^^^^ | = help: consider using a struct instead @@ -90,7 +90,7 @@ error: `extern` block uses type `(i32, i32)` which is not FFI-safe: tuples have error: `extern` block uses type `(i32, i32)` which is not FFI-safe: tuples have unspecified layout --> $DIR/lint-ctypes.rs:64:27 | -64 | pub fn tuple_type2(p: I32Pair); //~ ERROR uses type `(i32, i32)` +LL | pub fn tuple_type2(p: I32Pair); //~ ERROR uses type `(i32, i32)` | ^^^^^^^ | = help: consider using a struct instead @@ -98,32 +98,32 @@ error: `extern` block uses type `(i32, i32)` which is not FFI-safe: tuples have error: `extern` block uses type `ZeroSize` which is not FFI-safe: this struct has no fields --> $DIR/lint-ctypes.rs:65:25 | -65 | pub fn zero_size(p: ZeroSize); //~ ERROR struct has no fields +LL | pub fn zero_size(p: ZeroSize); //~ ERROR struct has no fields | ^^^^^^^^ | = help: consider adding a member to this struct note: type defined here --> $DIR/lint-ctypes.rs:28:1 | -28 | pub struct ZeroSize; +LL | pub struct ZeroSize; | ^^^^^^^^^^^^^^^^^^^^ error: `extern` block uses type `ZeroSizeWithPhantomData` which is not FFI-safe: composed only of PhantomData --> $DIR/lint-ctypes.rs:66:33 | -66 | pub fn zero_size_phantom(p: ZeroSizeWithPhantomData); //~ ERROR composed only of PhantomData +LL | pub fn zero_size_phantom(p: ZeroSizeWithPhantomData); //~ ERROR composed only of PhantomData | ^^^^^^^^^^^^^^^^^^^^^^^ error: `extern` block uses type `std::marker::PhantomData<bool>` which is not FFI-safe: composed only of PhantomData --> $DIR/lint-ctypes.rs:68:12 | -68 | -> ::std::marker::PhantomData<bool>; //~ ERROR: composed only of PhantomData +LL | -> ::std::marker::PhantomData<bool>; //~ ERROR: composed only of PhantomData | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: `extern` block uses type `fn()` which is not FFI-safe: this function pointer has Rust-specific calling convention --> $DIR/lint-ctypes.rs:69:23 | -69 | pub fn fn_type(p: RustFn); //~ ERROR function pointer has Rust-specific +LL | pub fn fn_type(p: RustFn); //~ ERROR function pointer has Rust-specific | ^^^^^^ | = help: consider using an `fn "extern"(...) -> ...` function pointer instead @@ -131,7 +131,7 @@ error: `extern` block uses type `fn()` which is not FFI-safe: this function poin error: `extern` block uses type `fn()` which is not FFI-safe: this function pointer has Rust-specific calling convention --> $DIR/lint-ctypes.rs:70:24 | -70 | pub fn fn_type2(p: fn()); //~ ERROR function pointer has Rust-specific +LL | pub fn fn_type2(p: fn()); //~ ERROR function pointer has Rust-specific | ^^^^ | = help: consider using an `fn "extern"(...) -> ...` function pointer instead @@ -139,7 +139,7 @@ error: `extern` block uses type `fn()` which is not FFI-safe: this function poin error: `extern` block uses type `std::boxed::Box<u32>` which is not FFI-safe: this struct has unspecified layout --> $DIR/lint-ctypes.rs:71:28 | -71 | pub fn fn_contained(p: RustBadRet); //~ ERROR: uses type `std::boxed::Box<u32>` +LL | pub fn fn_contained(p: RustBadRet); //~ ERROR: uses type `std::boxed::Box<u32>` | ^^^^^^^^^^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct @@ -147,13 +147,13 @@ error: `extern` block uses type `std::boxed::Box<u32>` which is not FFI-safe: th error: `extern` block uses type `i128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI --> $DIR/lint-ctypes.rs:72:32 | -72 | pub fn transparent_i128(p: TransparentI128); //~ ERROR: uses type `i128` +LL | pub fn transparent_i128(p: TransparentI128); //~ ERROR: uses type `i128` | ^^^^^^^^^^^^^^^ error: `extern` block uses type `str` which is not FFI-safe: string slices have no C equivalent --> $DIR/lint-ctypes.rs:73:31 | -73 | pub fn transparent_str(p: TransparentStr); //~ ERROR: uses type `str` +LL | pub fn transparent_str(p: TransparentStr); //~ ERROR: uses type `str` | ^^^^^^^^^^^^^^ | = help: consider using `*const u8` and a length instead @@ -161,7 +161,7 @@ error: `extern` block uses type `str` which is not FFI-safe: string slices have error: `extern` block uses type `std::boxed::Box<u32>` which is not FFI-safe: this struct has unspecified layout --> $DIR/lint-ctypes.rs:74:30 | -74 | pub fn transparent_fn(p: TransparentBadFn); //~ ERROR: uses type `std::boxed::Box<u32>` +LL | pub fn transparent_fn(p: TransparentBadFn); //~ ERROR: uses type `std::boxed::Box<u32>` | ^^^^^^^^^^^^^^^^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct diff --git a/src/test/ui/lint-forbid-attr.stderr b/src/test/ui/lint-forbid-attr.stderr index 5c1386992a1..73a40a46c11 100644 --- a/src/test/ui/lint-forbid-attr.stderr +++ b/src/test/ui/lint-forbid-attr.stderr @@ -3,7 +3,7 @@ error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) | LL | #![forbid(deprecated)] | ---------- `forbid` level set here -12 | +LL | LL | #[allow(deprecated)] | ^^^^^^^^^^ overruled by previous forbid diff --git a/src/test/ui/lint-unconditional-recursion.stderr b/src/test/ui/lint-unconditional-recursion.stderr index 5f73e2b7adf..933c191551d 100644 --- a/src/test/ui/lint-unconditional-recursion.stderr +++ b/src/test/ui/lint-unconditional-recursion.stderr @@ -18,10 +18,10 @@ error: function cannot return without recurring | LL | fn baz() { //~ ERROR function cannot return without recurring | ^^^^^^^^ cannot return without recurring -25 | if true { +LL | if true { LL | baz() | ----- recursive call site -27 | } else { +LL | } else { LL | baz() | ----- recursive call site | @@ -32,7 +32,7 @@ error: function cannot return without recurring | LL | fn quz() -> bool { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^^^^ cannot return without recurring -37 | if true { +LL | if true { LL | while quz() {} | ----- recursive call site ... @@ -56,7 +56,7 @@ error: function cannot return without recurring | LL | fn bar(&self) { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^ cannot return without recurring -54 | loop { +LL | loop { LL | self.bar() | ---------- recursive call site | @@ -87,7 +87,7 @@ error: function cannot return without recurring | LL | fn bar(&self) { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^ cannot return without recurring -82 | loop { +LL | loop { LL | Foo2::bar(self) | --------------- recursive call site | diff --git a/src/test/ui/lint/outer-forbid.stderr b/src/test/ui/lint/outer-forbid.stderr index 4b5a5d7ee0f..62bec0fe7b3 100644 --- a/src/test/ui/lint/outer-forbid.stderr +++ b/src/test/ui/lint/outer-forbid.stderr @@ -3,7 +3,7 @@ error[E0453]: allow(unused_variables) overruled by outer forbid(unused) | LL | #![forbid(unused, non_snake_case)] | ------ `forbid` level set here -18 | +LL | LL | #[allow(unused_variables)] //~ ERROR overruled | ^^^^^^^^^^^^^^^^ overruled by previous forbid diff --git a/src/test/ui/lint/unreachable_pub-pub_crate.stderr b/src/test/ui/lint/unreachable_pub-pub_crate.stderr index a8e1d0b9678..d1711be456b 100644 --- a/src/test/ui/lint/unreachable_pub-pub_crate.stderr +++ b/src/test/ui/lint/unreachable_pub-pub_crate.stderr @@ -116,7 +116,7 @@ LL | ($visibility: vis, $name: ident) => { $visibility struct $name {} } | -----------^^^^^^^^^^^^^ | | | help: consider restricting its visibility: `pub(crate)` -50 | } +LL | } LL | define_empty_struct_with_visibility!(pub, Fluorine); | ---------------------------------------------------- in this macro invocation | diff --git a/src/test/ui/lint/unreachable_pub.stderr b/src/test/ui/lint/unreachable_pub.stderr index 8c6b945257a..1d693161108 100644 --- a/src/test/ui/lint/unreachable_pub.stderr +++ b/src/test/ui/lint/unreachable_pub.stderr @@ -116,7 +116,7 @@ LL | ($visibility: vis, $name: ident) => { $visibility struct $name {} } | -----------^^^^^^^^^^^^^ | | | help: consider restricting its visibility: `crate` -45 | } +LL | } LL | define_empty_struct_with_visibility!(pub, Fluorine); | ---------------------------------------------------- in this macro invocation | diff --git a/src/test/ui/lint/use_suggestion_json.stderr b/src/test/ui/lint/use_suggestion_json.stderr index 0ab5223a678..00624f7e5ca 100644 --- a/src/test/ui/lint/use_suggestion_json.stderr +++ b/src/test/ui/lint/use_suggestion_json.stderr @@ -374,13 +374,13 @@ LL | let x: Iter; | ^^^^ not found in this scope help: possible candidates are found in other modules, you can import them into scope | -20 | use std::collections::binary_heap::Iter; +LL | use std::collections::binary_heap::Iter; | -20 | use std::collections::btree_map::Iter; +LL | use std::collections::btree_map::Iter; | -20 | use std::collections::btree_set::Iter; +LL | use std::collections::btree_set::Iter; | -20 | use std::collections::hash_map::Iter; +LL | use std::collections::hash_map::Iter; | and 8 other candidates diff --git a/src/test/ui/loop-break-value-no-repeat.stderr b/src/test/ui/loop-break-value-no-repeat.stderr index 2daac758e8c..0f04847df4c 100644 --- a/src/test/ui/loop-break-value-no-repeat.stderr +++ b/src/test/ui/loop-break-value-no-repeat.stderr @@ -5,7 +5,7 @@ LL | break 22 //~ ERROR `break` with value from a `for` loop | ^^^^^^^^ can only break with a value inside `loop` help: instead, use `break` on its own without a value inside this `for` loop | -22 | break //~ ERROR `break` with value from a `for` loop +LL | break //~ ERROR `break` with value from a `for` loop | ^^^^^ error: aborting due to previous error diff --git a/src/test/ui/loops-reject-duplicate-labels.stderr b/src/test/ui/loops-reject-duplicate-labels.stderr index 5a8dfc39380..d1b874ea997 100644 --- a/src/test/ui/loops-reject-duplicate-labels.stderr +++ b/src/test/ui/loops-reject-duplicate-labels.stderr @@ -69,7 +69,7 @@ LL | / pub fn main() { //~ ERROR compilation successful LL | | let s = S; LL | | s.m1(); LL | | s.m2(); -53 | | foo(); +LL | | foo(); LL | | } | |_^ diff --git a/src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr b/src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr index 2f4ebf1d931..0cdd58fdbd7 100644 --- a/src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr +++ b/src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr @@ -11,7 +11,7 @@ warning: label name `'bad` shadows a lifetime name that is already in scope | LL | impl<'bad, 'c> Struct<'bad, 'c> { | ---- first declared here -44 | fn meth_bad(&self) { +LL | fn meth_bad(&self) { LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope @@ -20,7 +20,7 @@ warning: label name `'bad` shadows a lifetime name that is already in scope | LL | impl<'b, 'bad> Struct<'b, 'bad> { | ---- first declared here -51 | fn meth_bad2(&self) { +LL | fn meth_bad2(&self) { LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope @@ -45,7 +45,7 @@ warning: label name `'bad` shadows a lifetime name that is already in scope | LL | impl <'bad, 'e> Enum<'bad, 'e> { | ---- first declared here -70 | fn meth_bad(&self) { +LL | fn meth_bad(&self) { LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope @@ -54,7 +54,7 @@ warning: label name `'bad` shadows a lifetime name that is already in scope | LL | impl <'d, 'bad> Enum<'d, 'bad> { | ---- first declared here -76 | fn meth_bad2(&self) { +LL | fn meth_bad2(&self) { LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope @@ -88,7 +88,7 @@ warning: label name `'bad` shadows a lifetime name that is already in scope | LL | trait HasDefaultMethod2<'a,'bad> { | ---- first declared here -103| fn meth_bad(&self) { +LL | fn meth_bad(&self) { LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr index c566430cbf0..58fc3c3a65b 100644 --- a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr +++ b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr @@ -35,7 +35,7 @@ LL | real_method_stmt!(); | -------------------- in this macro invocation help: you must specify a concrete type for this numeric value, like `f32` | -51 | 2.0_f32.powi(2) //~ ERROR can't call method `powi` on ambiguous numeric type `{float}` +LL | 2.0_f32.powi(2) //~ ERROR can't call method `powi` on ambiguous numeric type `{float}` | ^^^^^^^ error[E0599]: no method named `fake` found for type `{integer}` in the current scope @@ -75,7 +75,7 @@ LL | let _ = real_method_expr!(); | ------------------- in this macro invocation help: you must specify a concrete type for this numeric value, like `f32` | -57 | 2.0_f32.powi(2) //~ ERROR can't call method `powi` on ambiguous numeric type `{float}` +LL | 2.0_f32.powi(2) //~ ERROR can't call method `powi` on ambiguous numeric type `{float}` | ^^^^^^^ error: aborting due to 8 previous errors diff --git a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr index 1ab2a8c872a..46cb027c907 100644 --- a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr +++ b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr @@ -1,13 +1,13 @@ error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 2 distinct arguments --> $DIR/closure-arg-count-expected-type-issue-47244.rs:24:14 | -24 | m.iter().map( |_, b| { +LL | m.iter().map( |_, b| { | ^^^ ------ takes 2 distinct arguments | | | expected closure that takes a single 2-tuple as argument help: change the closure to accept a tuple instead of individual arguments | -24 | m.iter().map( |(_, b)| { +LL | m.iter().map( |(_, b)| { | ^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/mismatched_types/closure-arg-count.stderr b/src/test/ui/mismatched_types/closure-arg-count.stderr index c7785b311d2..0370c2596cc 100644 --- a/src/test/ui/mismatched_types/closure-arg-count.stderr +++ b/src/test/ui/mismatched_types/closure-arg-count.stderr @@ -23,7 +23,7 @@ LL | [1, 2, 3].sort_by(|(tuple, tuple2)| panic!()); | expected closure that takes 2 distinct arguments help: change the closure to take multiple arguments instead of a single tuple | -19 | [1, 2, 3].sort_by(|tuple, tuple2| panic!()); +LL | [1, 2, 3].sort_by(|tuple, tuple2| panic!()); | ^^^^^^^^^^^^^^^ error[E0593]: closure is expected to take 2 distinct arguments, but it takes a single 2-tuple as argument @@ -35,7 +35,7 @@ LL | [1, 2, 3].sort_by(|(tuple, tuple2): (usize, _)| panic!()); | expected closure that takes 2 distinct arguments help: change the closure to take multiple arguments instead of a single tuple | -21 | [1, 2, 3].sort_by(|tuple, tuple2| panic!()); +LL | [1, 2, 3].sort_by(|tuple, tuple2| panic!()); | ^^^^^^^^^^^^^^^ error[E0593]: closure is expected to take 1 argument, but it takes 0 arguments @@ -61,7 +61,7 @@ LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i, x| i); | expected closure that takes a single 2-tuple as argument help: change the closure to accept a tuple instead of individual arguments | -26 | let _it = vec![1, 2, 3].into_iter().enumerate().map(|(i, x)| i); +LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|(i, x)| i); | ^^^^^^^^ error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 2 distinct arguments @@ -73,7 +73,7 @@ LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i: usize, x| i); | expected closure that takes a single 2-tuple as argument help: change the closure to accept a tuple instead of individual arguments | -28 | let _it = vec![1, 2, 3].into_iter().enumerate().map(|(i, x)| i); +LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|(i, x)| i); | ^^^^^^^^ error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 3 distinct arguments diff --git a/src/test/ui/mismatched_types/recovered-block.stderr b/src/test/ui/mismatched_types/recovered-block.stderr index 4103e38c53d..75fb7b28a6e 100644 --- a/src/test/ui/mismatched_types/recovered-block.stderr +++ b/src/test/ui/mismatched_types/recovered-block.stderr @@ -5,7 +5,7 @@ LL | pub Foo { text } | ^ help: add `struct` here to parse `Foo` as a public struct | -23 | pub struct Foo { text } +LL | pub struct Foo { text } | ^^^^^^ error: expected one of `(` or `<`, found `{` diff --git a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr b/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr index 2aee643a29c..cac85e7fbac 100644 --- a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr +++ b/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr @@ -3,7 +3,7 @@ error[E0631]: type mismatch in closure arguments | LL | let f = to_fn_mut(|x: usize, y: isize| -> isize { (x as isize) + y }); | ----------------------------- found signature of `fn(usize, isize) -> _` -24 | //~^ NOTE found signature of `fn(usize, isize) -> _` +LL | //~^ NOTE found signature of `fn(usize, isize) -> _` LL | let z = call_it(3, f); | ^^^^^^^ expected signature of `fn(isize, isize) -> _` | diff --git a/src/test/ui/nll/borrowed-match-issue-45045.stderr b/src/test/ui/nll/borrowed-match-issue-45045.stderr index 500915b56e5..144eba8cb76 100644 --- a/src/test/ui/nll/borrowed-match-issue-45045.stderr +++ b/src/test/ui/nll/borrowed-match-issue-45045.stderr @@ -3,7 +3,7 @@ error[E0503]: cannot use `e` because it was mutably borrowed | LL | let f = &mut e; | ------ borrow of `e` occurs here -23 | let g = f; +LL | let g = f; LL | / match e { //~ cannot use `e` because it was mutably borrowed [E0503] LL | | Xyz::A => println!("a"), LL | | //~^ cannot use `e` because it was mutably borrowed [E0503] diff --git a/src/test/ui/nll/borrowed-referent-issue-38899.stderr b/src/test/ui/nll/borrowed-referent-issue-38899.stderr index 04b3fd73546..91f81783297 100644 --- a/src/test/ui/nll/borrowed-referent-issue-38899.stderr +++ b/src/test/ui/nll/borrowed-referent-issue-38899.stderr @@ -3,7 +3,7 @@ error[E0502]: cannot borrow `*block.current` as immutable because it is also bor | LL | let x = &mut block; | ---------- mutable borrow occurs here -23 | println!("{}", x.current); +LL | println!("{}", x.current); LL | let p: &'a u8 = &*block.current; | ^^^^^^^^^^^^^^^ immutable borrow occurs here diff --git a/src/test/ui/nll/capture-ref-in-struct.stderr b/src/test/ui/nll/capture-ref-in-struct.stderr index 2a478eddb5e..316a918e4ee 100644 --- a/src/test/ui/nll/capture-ref-in-struct.stderr +++ b/src/test/ui/nll/capture-ref-in-struct.stderr @@ -6,7 +6,7 @@ LL | y: &y, ... LL | } | - borrowed value only lives until here -39 | +LL | LL | deref(p); | - borrow later used here | diff --git a/src/test/ui/nll/closure-requirements/escape-argument.stderr b/src/test/ui/nll/closure-requirements/escape-argument.stderr index ded6ddb7b64..93a7bab3386 100644 --- a/src/test/ui/nll/closure-requirements/escape-argument.stderr +++ b/src/test/ui/nll/closure-requirements/escape-argument.stderr @@ -28,10 +28,10 @@ error[E0597]: `y` does not live long enough | LL | closure(&mut p, &y); | ^^ borrowed value does not live long enough -38 | //~^ ERROR `y` does not live long enough [E0597] +LL | //~^ ERROR `y` does not live long enough [E0597] LL | } | - borrowed value only lives until here -40 | +LL | LL | deref(p); | - borrow later used here | diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr index 0b232146314..b6c1d808ff5 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr +++ b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr @@ -58,7 +58,7 @@ LL | | }; ... LL | } | - borrowed value only lives until here -37 | +LL | LL | deref(p); | - borrow later used here | diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr index 15dc1f374e9..3cb6524f3b4 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr +++ b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr @@ -35,7 +35,7 @@ LL | let mut closure = || p = &y; ... LL | } | - borrowed value only lives until here -37 | +LL | LL | deref(p); | - borrow later used here | diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr index 1504b7dc0d4..0c058e40a50 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr @@ -17,7 +17,7 @@ LL | / |_outlives1, _outlives2, _outlives3, x, y| { LL | | // Only works if 'x: 'y: LL | | let p = x.get(); LL | | //~^ WARN not reporting region error due to -Znll -57 | | //~| ERROR does not outlive free region +LL | | //~| ERROR does not outlive free region LL | | demand_y(x, y, p) LL | | }, | |_________^ diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr index ebaf14b69ae..798f222c136 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr @@ -12,7 +12,7 @@ LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, LL | | //~^ ERROR lifetime mismatch LL | | LL | | // Only works if 'x: 'y: -57 | | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to -Znll +LL | | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to -Znll LL | | }); | |_____^ | diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr index 281674821fd..3131142ec73 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr @@ -12,7 +12,7 @@ LL | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { LL | | //~^ ERROR does not outlive free region LL | | LL | | // Only works if 'x: 'y: -49 | | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to -Znll +LL | | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to -Znll LL | | }); | |_____^ | @@ -31,7 +31,7 @@ LL | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { LL | | //~^ ERROR does not outlive free region LL | | LL | | // Only works if 'x: 'y: -49 | | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to -Znll +LL | | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to -Znll LL | | }); | |_____^ diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr index 8ef5ebdcdb7..5b038653b60 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr @@ -12,7 +12,7 @@ LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, LL | | //~^ ERROR does not outlive free region LL | | // Only works if 'x: 'y: LL | | demand_y(x, y, x.get()) -52 | | //~^ WARNING not reporting region error due to -Znll +LL | | //~^ WARNING not reporting region error due to -Znll LL | | }); | |_____^ | @@ -31,7 +31,7 @@ LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, LL | | //~^ ERROR does not outlive free region LL | | // Only works if 'x: 'y: LL | | demand_y(x, y, x.get()) -52 | | //~^ WARNING not reporting region error due to -Znll +LL | | //~^ WARNING not reporting region error due to -Znll LL | | }); | |_____^ diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr index b68757149be..6eb0926b1c8 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr @@ -12,7 +12,7 @@ LL | establish_relationships(cell_a, cell_b, |outlives1, outlives2, x, y| LL | | //~^ ERROR lifetime mismatch LL | | LL | | // Only works if 'x: 'y: -50 | | demand_y(outlives1, outlives2, x.get()) //~ WARNING not reporting region error due to -Znll +LL | | demand_y(outlives1, outlives2, x.get()) //~ WARNING not reporting region error due to -Znll LL | | }); | |_____^ | diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr index 57a2a9acde9..ce808f56b42 100644 --- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr @@ -18,7 +18,7 @@ LL | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { LL | | // Only works if 'x: 'y: LL | | demand_y(x, y, x.get()) LL | | //~^ WARN not reporting region error due to -Znll -49 | | //~| ERROR does not outlive free region +LL | | //~| ERROR does not outlive free region LL | | }); | |_____^ | diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr index 7cc0283b341..547ff75bac6 100644 --- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr @@ -18,7 +18,7 @@ LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, LL | | // Only works if 'x: 'y: LL | | demand_y(x, y, x.get()) LL | | //~^ WARN not reporting region error due to -Znll -53 | | //~| ERROR does not outlive free region +LL | | //~| ERROR does not outlive free region LL | | }); | |_____^ | diff --git a/src/test/ui/nll/get_default.stderr b/src/test/ui/nll/get_default.stderr index 69012151cdb..37c9a10cf92 100644 --- a/src/test/ui/nll/get_default.stderr +++ b/src/test/ui/nll/get_default.stderr @@ -15,7 +15,7 @@ error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as imm | LL | match map.get() { | --- immutable borrow occurs here -43 | Some(v) => { +LL | Some(v) => { LL | map.set(String::new()); // Both AST and MIR error here | ^^^ mutable borrow occurs here ... @@ -39,7 +39,7 @@ error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as imm | LL | match map.get() { | --- immutable borrow occurs here -43 | Some(v) => { +LL | Some(v) => { LL | map.set(String::new()); // Both AST and MIR error here | ^^^ mutable borrow occurs here ... diff --git a/src/test/ui/nll/guarantor-issue-46974.stderr b/src/test/ui/nll/guarantor-issue-46974.stderr index 1a257c5968c..4bcbb596e5c 100644 --- a/src/test/ui/nll/guarantor-issue-46974.stderr +++ b/src/test/ui/nll/guarantor-issue-46974.stderr @@ -3,7 +3,7 @@ error[E0506]: cannot assign to `*s` because it is borrowed | LL | let t = &mut *s; // this borrow should last for the entire function | ------- borrow of `*s` occurs here -18 | let x = &t.0; +LL | let x = &t.0; LL | *s = (2,); //~ ERROR cannot assign to `*s` | ^^^^^^^^^ assignment to borrowed `*s` occurs here @@ -12,7 +12,7 @@ error[E0621]: explicit lifetime required in the type of `s` | LL | fn bar(s: &Box<(i32,)>) -> &'static i32 { | - consider changing the type of `s` to `&'static std::boxed::Box<(i32,)>` -24 | // FIXME(#46983): error message should be better +LL | // FIXME(#46983): error message should be better LL | &s.0 //~ ERROR explicit lifetime required in the type of `s` [E0621] | ^^^^ lifetime `'static` required diff --git a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr b/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr index d12dbfceb4d..d34b8184e6d 100644 --- a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr +++ b/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr @@ -6,7 +6,7 @@ LL | let wrap = Wrap { p: &mut x }; ... LL | x = 1; //~ ERROR cannot assign to `x` because it is borrowed [E0506] | ^^^^^ assignment to borrowed `x` occurs here -33 | // FIXME ^ Should not error in the future with implicit dtors, only manually implemented ones +LL | // FIXME ^ Should not error in the future with implicit dtors, only manually implemented ones LL | } | - borrow later used here, when `foo` is dropped diff --git a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr b/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr index db9f2cc6359..96eb2afd5b1 100644 --- a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr +++ b/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr @@ -6,7 +6,7 @@ LL | let wrap = Wrap { p: &mut x }; ... LL | x = 1; //~ ERROR cannot assign to `x` because it is borrowed [E0506] | ^^^^^ assignment to borrowed `x` occurs here -33 | // FIXME ^ This currently errors and it should not. +LL | // FIXME ^ This currently errors and it should not. LL | } | - borrow later used here, when `foo` is dropped diff --git a/src/test/ui/nll/return-ref-mut-issue-46557.stderr b/src/test/ui/nll/return-ref-mut-issue-46557.stderr index 8f27662aa4e..f7e85e4277b 100644 --- a/src/test/ui/nll/return-ref-mut-issue-46557.stderr +++ b/src/test/ui/nll/return-ref-mut-issue-46557.stderr @@ -3,7 +3,7 @@ error[E0597]: borrowed value does not live long enough | LL | let ref mut x = 1234543; //~ ERROR borrowed value does not live long enough [E0597] | ^^^^^^^ temporary value does not live long enough -18 | x +LL | x LL | } | - temporary value only lives until here | diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr b/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr index 5660857dd00..e97392e5979 100644 --- a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr @@ -72,7 +72,7 @@ LL | / fn correct_region<'a, T>(x: Box<T>) -> Box<dyn Anything + 'a> LL | | where LL | | T: 'a + Iterator, LL | | { -46 | | with_signature(x, |mut y| Box::new(y.next())) +LL | | with_signature(x, |mut y| Box::new(y.next())) LL | | } | |_^ | @@ -146,7 +146,7 @@ LL | / fn outlives_region<'a, 'b, T>(x: Box<T>) -> Box<dyn Anything + 'a> LL | | where LL | | T: 'b + Iterator, LL | | 'b: 'a, -64 | | { +LL | | { LL | | with_signature(x, |mut y| Box::new(y.next())) LL | | } | |_^ diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr index 0e18fccafc1..eb15d3b85d2 100644 --- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr @@ -157,7 +157,7 @@ LL | / fn elements_outlive<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where LL | | T: Anything<'b>, LL | | 'b: 'a, -90 | | { +LL | | { LL | | with_signature(cell, t, |cell, t| require(cell, t)); LL | | } | |_^ diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr index 2f0e3af390e..b124ac80004 100644 --- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr @@ -48,7 +48,7 @@ LL | / fn no_relationships_early<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where LL | | T: Anything<'b>, LL | | 'a: 'a, -55 | | { +LL | | { LL | | with_signature(cell, t, |cell, t| require(cell, t)); LL | | } | |_^ @@ -112,7 +112,7 @@ LL | / fn elements_outlive<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where LL | | T: Anything<'b>, LL | | 'b: 'a, -83 | | { +LL | | { LL | | with_signature(cell, t, |cell, t| require(cell, t)); LL | | } | |_^ diff --git a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr index 9190cf51752..6fb92d29748 100644 --- a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr @@ -176,7 +176,7 @@ LL | / fn elements_outlive1<'a, 'b, 'c, T>(cell: Cell<&'a ()>, t: T) LL | | where LL | | T: Anything<'b, 'c>, LL | | 'b: 'a, -91 | | { +LL | | { LL | | with_signature(cell, t, |cell, t| require(cell, t)); LL | | } | |_^ @@ -212,7 +212,7 @@ LL | / fn elements_outlive2<'a, 'b, 'c, T>(cell: Cell<&'a ()>, t: T) LL | | where LL | | T: Anything<'b, 'c>, LL | | 'c: 'a, -100| | { +LL | | { LL | | with_signature(cell, t, |cell, t| require(cell, t)); LL | | } | |_^ @@ -285,7 +285,7 @@ LL | / fn two_regions_outlive<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where LL | | T: Anything<'b, 'b>, LL | | 'b: 'a, -119| | { +LL | | { LL | | with_signature(cell, t, |cell, t| require(cell, t)); LL | | } | |_^ diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr index 5fba60d8cd5..443439298a3 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr +++ b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr @@ -37,7 +37,7 @@ LL | / fn generic<T>(value: T) { LL | | let cell = Cell::new(&()); LL | | twice(cell, value, |a, b| invoke(a, b)); LL | | //~^ WARNING not reporting region error -37 | | // +LL | | // LL | | // This error from the old region solver looks bogus. LL | | } | |_^ @@ -75,7 +75,7 @@ LL | / fn generic_fail<'a, T>(cell: Cell<&'a ()>, value: T) { LL | | twice(cell, value, |a, b| invoke(a, b)); LL | | //~^ WARNING not reporting region error LL | | //~| WARNING not reporting region error -46 | | //~| ERROR the parameter type `T` may not live long enough +LL | | //~| ERROR the parameter type `T` may not live long enough LL | | } | |_^ | diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr index d911579325d..6aa37311019 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr +++ b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr @@ -130,7 +130,7 @@ LL | with_signature(a, b, |x, y| { LL | | //~^ ERROR the parameter type `T` may not live long enough LL | | // See `correct_region` LL | | require(&x, &y) -80 | | //~^ WARNING not reporting region error due to -Znll +LL | | //~^ WARNING not reporting region error due to -Znll LL | | }) | |_____^ | diff --git a/src/test/ui/region-borrow-params-issue-29793-small.stderr b/src/test/ui/region-borrow-params-issue-29793-small.stderr index 62d6c9838a0..a342f51e257 100644 --- a/src/test/ui/region-borrow-params-issue-29793-small.stderr +++ b/src/test/ui/region-borrow-params-issue-29793-small.stderr @@ -59,7 +59,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x | may outlive borrowed value `x` help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword | -65 | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function @@ -71,7 +71,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x | may outlive borrowed value `y` help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -65 | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function @@ -83,7 +83,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x | may outlive borrowed value `x` help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword | -76 | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function @@ -95,7 +95,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x | may outlive borrowed value `y` help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -76 | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function @@ -107,7 +107,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `x` help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword | -100| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function @@ -119,7 +119,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `y` help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -100| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function @@ -131,7 +131,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `x` help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword | -114| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function @@ -143,7 +143,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `y` help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -114| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function @@ -155,7 +155,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `x` help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword | -142| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function @@ -167,7 +167,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `y` help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -142| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function @@ -179,7 +179,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `x` help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword | -157| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function @@ -191,7 +191,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `y` help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -157| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function @@ -203,7 +203,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `x` help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword | -185| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function @@ -215,7 +215,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `y` help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -185| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function @@ -227,7 +227,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `x` help: to force the closure to take ownership of `x` (and any other referenced variables), use the `move` keyword | -199| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function @@ -239,7 +239,7 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo | may outlive borrowed value `y` help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -199| let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) +LL | let f = move |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^^^^^^ error: aborting due to 20 previous errors diff --git a/src/test/ui/regions-nested-fns-2.stderr b/src/test/ui/regions-nested-fns-2.stderr index 7a86a26b320..16bec5ee218 100644 --- a/src/test/ui/regions-nested-fns-2.stderr +++ b/src/test/ui/regions-nested-fns-2.stderr @@ -3,12 +3,12 @@ error[E0373]: closure may outlive the current function, but it borrows `y`, whic | LL | |z| { | ^^^ may outlive borrowed value `y` -17 | //~^ ERROR E0373 +LL | //~^ ERROR E0373 LL | if false { &y } else { z } | - `y` is borrowed here help: to force the closure to take ownership of `y` (and any other referenced variables), use the `move` keyword | -16 | move |z| { +LL | move |z| { | ^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/resolve-conflict-item-vs-import.stderr b/src/test/ui/resolve-conflict-item-vs-import.stderr index 1b060c0ac11..73e3e961137 100644 --- a/src/test/ui/resolve-conflict-item-vs-import.stderr +++ b/src/test/ui/resolve-conflict-item-vs-import.stderr @@ -3,14 +3,14 @@ error[E0255]: the name `transmute` is defined multiple times | LL | use std::mem::transmute; | ------------------- previous import of the value `transmute` here -12 | +LL | LL | fn transmute() {} | ^^^^^^^^^^^^^^ `transmute` redefined here | = note: `transmute` must be defined only once in the value namespace of this module help: You can use `as` to change the binding name of the import | -11 | use std::mem::transmute as other_transmute; +LL | use std::mem::transmute as other_transmute; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.stderr b/src/test/ui/resolve/enums-are-namespaced-xc.stderr index e5d75d6e470..df65f5ddded 100644 --- a/src/test/ui/resolve/enums-are-namespaced-xc.stderr +++ b/src/test/ui/resolve/enums-are-namespaced-xc.stderr @@ -5,7 +5,7 @@ LL | let _ = namespaced_enums::A; | ^ not found in `namespaced_enums` help: possible candidate is found in another module, you can import it into scope | -14 | use namespaced_enums::Foo::A; +LL | use namespaced_enums::Foo::A; | error[E0425]: cannot find function `B` in module `namespaced_enums` @@ -15,7 +15,7 @@ LL | let _ = namespaced_enums::B(10); | ^ not found in `namespaced_enums` help: possible candidate is found in another module, you can import it into scope | -14 | use namespaced_enums::Foo::B; +LL | use namespaced_enums::Foo::B; | error[E0422]: cannot find struct, variant or union type `C` in module `namespaced_enums` @@ -25,7 +25,7 @@ LL | let _ = namespaced_enums::C { a: 10 }; | ^ not found in `namespaced_enums` help: possible candidate is found in another module, you can import it into scope | -14 | use namespaced_enums::Foo::C; +LL | use namespaced_enums::Foo::C; | error: aborting due to 3 previous errors diff --git a/src/test/ui/resolve/issue-16058.stderr b/src/test/ui/resolve/issue-16058.stderr index f9d3c470377..36c62408de7 100644 --- a/src/test/ui/resolve/issue-16058.stderr +++ b/src/test/ui/resolve/issue-16058.stderr @@ -5,11 +5,11 @@ LL | Result { | ^^^^^^ not a struct, variant or union type help: possible better candidates are found in other modules, you can import them into scope | -12 | use std::fmt::Result; +LL | use std::fmt::Result; | -12 | use std::io::Result; +LL | use std::io::Result; | -12 | use std::thread::Result; +LL | use std::thread::Result; | error: aborting due to previous error diff --git a/src/test/ui/resolve/issue-17518.stderr b/src/test/ui/resolve/issue-17518.stderr index 32db6c70e15..c5d8f457ec7 100644 --- a/src/test/ui/resolve/issue-17518.stderr +++ b/src/test/ui/resolve/issue-17518.stderr @@ -5,7 +5,7 @@ LL | E { name: "foobar" }; //~ ERROR cannot find struct, variant or union ty | ^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -11 | use SomeEnum::E; +LL | use SomeEnum::E; | error: aborting due to previous error diff --git a/src/test/ui/resolve/issue-21221-1.stderr b/src/test/ui/resolve/issue-21221-1.stderr index 467ac66cd73..8056a47b464 100644 --- a/src/test/ui/resolve/issue-21221-1.stderr +++ b/src/test/ui/resolve/issue-21221-1.stderr @@ -5,11 +5,11 @@ LL | impl Mul for Foo { | ^^^ not found in this scope help: possible candidates are found in other modules, you can import them into scope | -11 | use mul1::Mul; +LL | use mul1::Mul; | -11 | use mul2::Mul; +LL | use mul2::Mul; | -11 | use std::ops::Mul; +LL | use std::ops::Mul; | error[E0412]: cannot find type `Mul` in this scope @@ -19,13 +19,13 @@ LL | fn getMul() -> Mul { | ^^^ not found in this scope help: possible candidates are found in other modules, you can import them into scope | -11 | use mul1::Mul; +LL | use mul1::Mul; | -11 | use mul2::Mul; +LL | use mul2::Mul; | -11 | use mul3::Mul; +LL | use mul3::Mul; | -11 | use mul4::Mul; +LL | use mul4::Mul; | and 2 other candidates @@ -42,7 +42,7 @@ LL | impl Div for Foo { | ^^^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -11 | use std::ops::Div; +LL | use std::ops::Div; | error: cannot continue compilation due to previous error diff --git a/src/test/ui/resolve/issue-21221-2.stderr b/src/test/ui/resolve/issue-21221-2.stderr index ab7686ad42e..398c85920fd 100644 --- a/src/test/ui/resolve/issue-21221-2.stderr +++ b/src/test/ui/resolve/issue-21221-2.stderr @@ -5,7 +5,7 @@ LL | impl T for Foo { } | ^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -11 | use foo::bar::T; +LL | use foo::bar::T; | error[E0601]: main function not found diff --git a/src/test/ui/resolve/issue-21221-3.stderr b/src/test/ui/resolve/issue-21221-3.stderr index ee52278fa93..75601e932df 100644 --- a/src/test/ui/resolve/issue-21221-3.stderr +++ b/src/test/ui/resolve/issue-21221-3.stderr @@ -5,7 +5,7 @@ LL | impl OuterTrait for Foo {} | ^^^^^^^^^^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -18 | use issue_21221_3::outer::OuterTrait; +LL | use issue_21221_3::outer::OuterTrait; | error: cannot continue compilation due to previous error diff --git a/src/test/ui/resolve/issue-21221-4.stderr b/src/test/ui/resolve/issue-21221-4.stderr index 76d7d5bd5ee..10dcf0aa3b9 100644 --- a/src/test/ui/resolve/issue-21221-4.stderr +++ b/src/test/ui/resolve/issue-21221-4.stderr @@ -5,7 +5,7 @@ LL | impl T for Foo {} | ^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -18 | use issue_21221_4::T; +LL | use issue_21221_4::T; | error: cannot continue compilation due to previous error diff --git a/src/test/ui/resolve/issue-3907.stderr b/src/test/ui/resolve/issue-3907.stderr index a0d2f3a8bf8..80ee2e028eb 100644 --- a/src/test/ui/resolve/issue-3907.stderr +++ b/src/test/ui/resolve/issue-3907.stderr @@ -5,7 +5,7 @@ LL | impl Foo for S { //~ ERROR expected trait, found type alias `Foo` | ^^^ type aliases cannot be used for traits help: possible better candidate is found in another module, you can import it into scope | -14 | use issue_3907::Foo; +LL | use issue_3907::Foo; | error: cannot continue compilation due to previous error diff --git a/src/test/ui/resolve/privacy-enum-ctor.stderr b/src/test/ui/resolve/privacy-enum-ctor.stderr index a23b587a90c..7af2f5931dc 100644 --- a/src/test/ui/resolve/privacy-enum-ctor.stderr +++ b/src/test/ui/resolve/privacy-enum-ctor.stderr @@ -40,9 +40,9 @@ LL | let _: E = m::E; - `E::Unit` help: possible better candidates are found in other modules, you can import them into scope | -48 | use std::f32::consts::E; +LL | use std::f32::consts::E; | -48 | use std::f64::consts::E; +LL | use std::f64::consts::E; | error[E0423]: expected value, found struct variant `m::E::Struct` @@ -63,9 +63,9 @@ LL | let _: E = E; - `E::Unit` help: possible better candidates are found in other modules, you can import them into scope | -48 | use std::f32::consts::E; +LL | use std::f32::consts::E; | -48 | use std::f64::consts::E; +LL | use std::f64::consts::E; | error[E0423]: expected value, found struct variant `E::Struct` @@ -81,7 +81,7 @@ LL | let _: Z = m::n::Z; | ^ did you mean `E`? help: possible candidate is found in another module, you can import it into scope | -48 | use m::n::Z; +LL | use m::n::Z; | error[E0423]: expected value, found enum `m::n::Z` @@ -102,7 +102,7 @@ LL | let _: Z = m::n::Z::Fn; | ^ did you mean `E`? help: possible candidate is found in another module, you can import it into scope | -48 | use m::n::Z; +LL | use m::n::Z; | error[E0412]: cannot find type `Z` in this scope @@ -112,7 +112,7 @@ LL | let _: Z = m::n::Z::Struct; | ^ did you mean `E`? help: possible candidate is found in another module, you can import it into scope | -48 | use m::n::Z; +LL | use m::n::Z; | error[E0423]: expected value, found struct variant `m::n::Z::Struct` @@ -128,7 +128,7 @@ LL | let _: Z = m::n::Z::Unit {}; | ^ did you mean `E`? help: possible candidate is found in another module, you can import it into scope | -48 | use m::n::Z; +LL | use m::n::Z; | error[E0603]: enum `Z` is private @@ -174,7 +174,7 @@ LL | let _ = Z::Unit(); | ^^^^^^^^^ not a function help: `Z::Unit` is a unit variant, you need to write it without the parenthesis | -41 | let _ = Z::Unit; +LL | let _ = Z::Unit; | ^^^^^^^ error[E0308]: mismatched types @@ -196,7 +196,7 @@ LL | let _: E = m::E::Unit(); | ^^^^^^^^^^^^ not a function help: `m::E::Unit` is a unit variant, you need to write it without the parenthesis | -57 | let _: E = m::E::Unit; +LL | let _: E = m::E::Unit; | ^^^^^^^^^^ error[E0308]: mismatched types @@ -218,7 +218,7 @@ LL | let _: E = E::Unit(); | ^^^^^^^^^ not a function help: `E::Unit` is a unit variant, you need to write it without the parenthesis | -65 | let _: E = E::Unit; +LL | let _: E = E::Unit; | ^^^^^^^ error: aborting due to 23 previous errors diff --git a/src/test/ui/resolve/privacy-struct-ctor.stderr b/src/test/ui/resolve/privacy-struct-ctor.stderr index 9b7964f705f..ddd8f238e87 100644 --- a/src/test/ui/resolve/privacy-struct-ctor.stderr +++ b/src/test/ui/resolve/privacy-struct-ctor.stderr @@ -8,7 +8,7 @@ LL | Z; | constructor is not visible here due to private fields help: possible better candidate is found in another module, you can import it into scope | -25 | use m::n::Z; +LL | use m::n::Z; | error[E0423]: expected value, found struct `S` @@ -18,7 +18,7 @@ LL | S; | ^ constructor is not visible here due to private fields help: possible better candidate is found in another module, you can import it into scope | -35 | use m::S; +LL | use m::S; | error[E0423]: expected value, found struct `S2` @@ -34,7 +34,7 @@ LL | xcrate::S; | ^^^^^^^^^ constructor is not visible here due to private fields help: possible better candidate is found in another module, you can import it into scope | -35 | use m::S; +LL | use m::S; | error[E0603]: tuple struct `Z` is private diff --git a/src/test/ui/resolve/use_suggestion_placement.stderr b/src/test/ui/resolve/use_suggestion_placement.stderr index 8e70a579781..da2ea67ad08 100644 --- a/src/test/ui/resolve/use_suggestion_placement.stderr +++ b/src/test/ui/resolve/use_suggestion_placement.stderr @@ -5,7 +5,7 @@ LL | type Bar = Path; //~ ERROR cannot find | ^^^^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -23 | use std::path::Path; +LL | use std::path::Path; | error[E0425]: cannot find value `A` in this scope @@ -15,7 +15,7 @@ LL | let _ = A; //~ ERROR cannot find | ^ not found in this scope help: possible candidate is found in another module, you can import it into scope | -13 | use m::A; +LL | use m::A; | error[E0412]: cannot find type `HashMap` in this scope @@ -25,9 +25,9 @@ LL | type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find | ^^^^^^^ not found in this scope help: possible candidates are found in other modules, you can import them into scope | -13 | use std::collections::HashMap; +LL | use std::collections::HashMap; | -13 | use std::collections::hash_map::HashMap; +LL | use std::collections::hash_map::HashMap; | error: aborting due to 3 previous errors diff --git a/src/test/ui/span/E0072.stderr b/src/test/ui/span/E0072.stderr index de0d29f6432..1c03cfe0e9e 100644 --- a/src/test/ui/span/E0072.stderr +++ b/src/test/ui/span/E0072.stderr @@ -3,7 +3,7 @@ error[E0072]: recursive type `ListNode` has infinite size | LL | struct ListNode { //~ ERROR has infinite size | ^^^^^^^^^^^^^^^ recursive type has infinite size -12 | head: u8, +LL | head: u8, LL | tail: Option<ListNode>, | ---------------------- recursive without indirection | diff --git a/src/test/ui/span/E0204.stderr b/src/test/ui/span/E0204.stderr index 88eb36c1e4c..aa21c6762e7 100644 --- a/src/test/ui/span/E0204.stderr +++ b/src/test/ui/span/E0204.stderr @@ -12,7 +12,7 @@ error[E0204]: the trait `Copy` may not be implemented for this type | LL | #[derive(Copy)] //~ ERROR may not be implemented for this type | ^^^^ -18 | struct Foo2<'a> { +LL | struct Foo2<'a> { LL | ty: &'a mut bool, | ---------------- this field does not implement `Copy` @@ -30,7 +30,7 @@ error[E0204]: the trait `Copy` may not be implemented for this type | LL | #[derive(Copy)] //~ ERROR may not be implemented for this type | ^^^^ -30 | enum EFoo2<'a> { +LL | enum EFoo2<'a> { LL | Bar(&'a mut bool), | ------------- this field does not implement `Copy` diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr index 5eb00f24e36..a06b7097ee3 100644 --- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr +++ b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr @@ -5,7 +5,7 @@ LL | f(Box::new(|| { | - ^^ second mutable borrow occurs here | | | first mutable borrow occurs here -23 | //~^ ERROR: cannot borrow `f` as mutable more than once +LL | //~^ ERROR: cannot borrow `f` as mutable more than once LL | f((Box::new(|| {}))) | - borrow occurs due to use of `f` in closure LL | })); @@ -40,7 +40,7 @@ error[E0507]: cannot move out of captured outer variable in an `FnMut` closure | LL | let mut f = |g: Box<FnMut(isize)>, b: isize| {}; | ----- captured outer variable -62 | f(Box::new(|a| { +LL | f(Box::new(|a| { LL | foo(f); | ^ cannot move out of captured outer variable in an `FnMut` closure diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr index fb2427b687f..8111f80690a 100644 --- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr +++ b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr @@ -3,7 +3,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable | LL | fn b(x: &Foo) { | ---- use `&mut Foo` here to make mutable -26 | x.f(); +LL | x.f(); LL | x.h(); //~ ERROR cannot borrow | ^ cannot borrow as mutable diff --git a/src/test/ui/span/borrowck-object-mutability.stderr b/src/test/ui/span/borrowck-object-mutability.stderr index 039184e05de..2f1a6c63141 100644 --- a/src/test/ui/span/borrowck-object-mutability.stderr +++ b/src/test/ui/span/borrowck-object-mutability.stderr @@ -3,7 +3,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable | LL | fn borrowed_receiver(x: &Foo) { | ---- use `&mut Foo` here to make mutable -18 | x.borrowed(); +LL | x.borrowed(); LL | x.borrowed_mut(); //~ ERROR cannot borrow | ^ cannot borrow as mutable @@ -12,7 +12,7 @@ error[E0596]: cannot borrow immutable `Box` content `*x` as mutable | LL | fn owned_receiver(x: Box<Foo>) { | - consider changing this to `mut x` -28 | x.borrowed(); +LL | x.borrowed(); LL | x.borrowed_mut(); //~ ERROR cannot borrow | ^ cannot borrow as mutable diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.stderr b/src/test/ui/span/borrowck-ref-into-rvalue.stderr index a5af38f40fd..cf423c278e1 100644 --- a/src/test/ui/span/borrowck-ref-into-rvalue.stderr +++ b/src/test/ui/span/borrowck-ref-into-rvalue.stderr @@ -6,7 +6,7 @@ LL | Some(ref m) => { ... LL | } | - borrowed value dropped here while still borrowed -20 | println!("{}", *msg); +LL | println!("{}", *msg); LL | } | - borrowed value needs to live until here | diff --git a/src/test/ui/span/dropck_arr_cycle_checked.stderr b/src/test/ui/span/dropck_arr_cycle_checked.stderr index 01250a0a701..5e6512c06bf 100644 --- a/src/test/ui/span/dropck_arr_cycle_checked.stderr +++ b/src/test/ui/span/dropck_arr_cycle_checked.stderr @@ -58,7 +58,7 @@ error[E0597]: `b2` does not live long enough | LL | b3.a[1].v.set(Some(&b2)); | ^^ borrowed value does not live long enough -114| //~^ ERROR `b2` does not live long enough +LL | //~^ ERROR `b2` does not live long enough LL | } | - `b2` dropped here while still borrowed | diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr index 872c75374f8..cf507df4e81 100644 --- a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr +++ b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr @@ -14,7 +14,7 @@ error[E0597]: `d1` does not live long enough | LL | d2.p.set(Some(&d1)); | ^^ borrowed value does not live long enough -49 | //~^ ERROR `d1` does not live long enough +LL | //~^ ERROR `d1` does not live long enough LL | } | - `d1` dropped here while still borrowed | diff --git a/src/test/ui/span/dropck_vec_cycle_checked.stderr b/src/test/ui/span/dropck_vec_cycle_checked.stderr index 34c7e89333a..f4ab3293543 100644 --- a/src/test/ui/span/dropck_vec_cycle_checked.stderr +++ b/src/test/ui/span/dropck_vec_cycle_checked.stderr @@ -58,7 +58,7 @@ error[E0597]: `c2` does not live long enough | LL | c3.v[1].v.set(Some(&c2)); | ^^ borrowed value does not live long enough -121| //~^ ERROR `c2` does not live long enough +LL | //~^ ERROR `c2` does not live long enough LL | } | - `c2` dropped here while still borrowed | diff --git a/src/test/ui/span/issue-24690.stderr b/src/test/ui/span/issue-24690.stderr index 92b6ee4b9c8..6a4ec73b27a 100644 --- a/src/test/ui/span/issue-24690.stderr +++ b/src/test/ui/span/issue-24690.stderr @@ -32,7 +32,7 @@ LL | / fn main() { //~ ERROR compilation successful LL | | let theTwo = 2; //~ WARN should have a snake case name LL | | let theOtherTwo = 2; //~ WARN should have a snake case name LL | | //~^ WARN unused variable -25 | | println!("{}", theTwo); +LL | | println!("{}", theTwo); LL | | } | |_^ diff --git a/src/test/ui/span/issue-25199.stderr b/src/test/ui/span/issue-25199.stderr index f8f36b721cb..fe2df9ce711 100644 --- a/src/test/ui/span/issue-25199.stderr +++ b/src/test/ui/span/issue-25199.stderr @@ -14,7 +14,7 @@ error[E0597]: `container` does not live long enough | LL | container.store(test); | ^^^^^^^^^ borrowed value does not live long enough -84 | //~^ ERROR `container` does not live long enough +LL | //~^ ERROR `container` does not live long enough LL | } | - `container` dropped here while still borrowed | diff --git a/src/test/ui/span/issue-35987.stderr b/src/test/ui/span/issue-35987.stderr index ccbff4fe485..596f2d76da6 100644 --- a/src/test/ui/span/issue-35987.stderr +++ b/src/test/ui/span/issue-35987.stderr @@ -5,7 +5,7 @@ LL | impl<T: Clone, Add> Add for Foo<T> { | ^^^ not a trait help: possible better candidate is found in another module, you can import it into scope | -13 | use std::ops::Add; +LL | use std::ops::Add; | error[E0601]: main function not found diff --git a/src/test/ui/span/issue-36537.stderr b/src/test/ui/span/issue-36537.stderr index 28c89096775..058e83ba4fd 100644 --- a/src/test/ui/span/issue-36537.stderr +++ b/src/test/ui/span/issue-36537.stderr @@ -3,7 +3,7 @@ error[E0597]: `a` does not live long enough | LL | p = &a; | ^ borrowed value does not live long enough -15 | //~^ ERROR `a` does not live long enough +LL | //~^ ERROR `a` does not live long enough LL | } | - `a` dropped here while still borrowed | diff --git a/src/test/ui/span/issue-39018.stderr b/src/test/ui/span/issue-39018.stderr index eda10bda886..9811d115c80 100644 --- a/src/test/ui/span/issue-39018.stderr +++ b/src/test/ui/span/issue-39018.stderr @@ -5,7 +5,7 @@ LL | let x = "Hello " + "World!"; | ^^^^^^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings help: `to_owned()` can be used to create an owned `String` from a string reference. String concatenation appends the string on the right to the string on the left and may require reallocation. This requires ownership of the string on the left | -12 | let x = "Hello ".to_owned() + "World!"; +LL | let x = "Hello ".to_owned() + "World!"; | ^^^^^^^^^^^^^^^^^^^ error[E0369]: binary operation `+` cannot be applied to type `World` diff --git a/src/test/ui/span/issue28498-reject-ex1.stderr b/src/test/ui/span/issue28498-reject-ex1.stderr index 24aec450700..adbbd676615 100644 --- a/src/test/ui/span/issue28498-reject-ex1.stderr +++ b/src/test/ui/span/issue28498-reject-ex1.stderr @@ -14,7 +14,7 @@ error[E0597]: `foo.data` does not live long enough | LL | foo.data[1].1.set(Some(&foo.data[0])); | ^^^^^^^^ borrowed value does not live long enough -47 | //~^ ERROR `foo.data` does not live long enough +LL | //~^ ERROR `foo.data` does not live long enough LL | } | - `foo.data` dropped here while still borrowed | diff --git a/src/test/ui/span/lint-unused-unsafe.stderr b/src/test/ui/span/lint-unused-unsafe.stderr index 2554dec59cf..f85ca4ef00f 100644 --- a/src/test/ui/span/lint-unused-unsafe.stderr +++ b/src/test/ui/span/lint-unused-unsafe.stderr @@ -59,7 +59,7 @@ error: unnecessary `unsafe` block | LL | unsafe fn bad7() { | ---------------- because it's nested under this `unsafe` fn -39 | unsafe { //~ ERROR: unnecessary `unsafe` block +LL | unsafe { //~ ERROR: unnecessary `unsafe` block LL | unsafe { //~ ERROR: unnecessary `unsafe` block | ^^^^^^ unnecessary `unsafe` block diff --git a/src/test/ui/span/missing-unit-argument.stderr b/src/test/ui/span/missing-unit-argument.stderr index 87f5aa514ce..a7417b006ad 100644 --- a/src/test/ui/span/missing-unit-argument.stderr +++ b/src/test/ui/span/missing-unit-argument.stderr @@ -5,7 +5,7 @@ LL | let _: Result<(), String> = Ok(); //~ ERROR this function takes | ^^^^ help: expected the unit value `()`; create it with empty parentheses | -21 | let _: Result<(), String> = Ok(()); //~ ERROR this function takes +LL | let _: Result<(), String> = Ok(()); //~ ERROR this function takes | ^^ error[E0061]: this function takes 2 parameters but 0 parameters were supplied @@ -36,7 +36,7 @@ LL | bar(); //~ ERROR this function takes | ^^^^^ help: expected the unit value `()`; create it with empty parentheses | -24 | bar(()); //~ ERROR this function takes +LL | bar(()); //~ ERROR this function takes | ^^ error[E0061]: this function takes 1 parameter but 0 parameters were supplied @@ -49,7 +49,7 @@ LL | S.baz(); //~ ERROR this function takes | ^^^ help: expected the unit value `()`; create it with empty parentheses | -25 | S.baz(()); //~ ERROR this function takes +LL | S.baz(()); //~ ERROR this function takes | ^^ error[E0061]: this function takes 1 parameter but 0 parameters were supplied @@ -62,7 +62,7 @@ LL | S.generic::<()>(); //~ ERROR this function takes | ^^^^^^^ help: expected the unit value `()`; create it with empty parentheses | -26 | S.generic::<()>(()); //~ ERROR this function takes +LL | S.generic::<()>(()); //~ ERROR this function takes | ^^ error: aborting due to 6 previous errors diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr b/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr index 8066ef501d2..15694106fe8 100644 --- a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr +++ b/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr @@ -5,7 +5,7 @@ LL | p = &*b; | ^ borrowed value does not live long enough LL | } | - `b` dropped here while still borrowed -20 | //~^^ ERROR `b` does not live long enough +LL | //~^^ ERROR `b` does not live long enough LL | } | - borrowed value needs to live until here diff --git a/src/test/ui/span/pub-struct-field.stderr b/src/test/ui/span/pub-struct-field.stderr index 5fb1c4cf41c..40819e2e8ba 100644 --- a/src/test/ui/span/pub-struct-field.stderr +++ b/src/test/ui/span/pub-struct-field.stderr @@ -11,7 +11,7 @@ error[E0124]: field `bar` is already declared | LL | bar: u8, | ------- `bar` first declared here -16 | pub bar: u8, //~ ERROR is already declared +LL | pub bar: u8, //~ ERROR is already declared LL | pub(crate) bar: u8, //~ ERROR is already declared | ^^^^^^^^^^^^^^^^^^ field already declared diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.stderr b/src/test/ui/span/regions-close-over-type-parameter-2.stderr index 1ba31a7e9d7..9e8c4000d06 100644 --- a/src/test/ui/span/regions-close-over-type-parameter-2.stderr +++ b/src/test/ui/span/regions-close-over-type-parameter-2.stderr @@ -3,7 +3,7 @@ error[E0597]: `tmp0` does not live long enough | LL | let tmp1 = &tmp0; | ^^^^ borrowed value does not live long enough -34 | repeater3(tmp1) +LL | repeater3(tmp1) LL | }; | -- borrowed value needs to live until here | | diff --git a/src/test/ui/span/regions-escape-loop-via-variable.stderr b/src/test/ui/span/regions-escape-loop-via-variable.stderr index 778b4c9f4c7..1bc8e996d01 100644 --- a/src/test/ui/span/regions-escape-loop-via-variable.stderr +++ b/src/test/ui/span/regions-escape-loop-via-variable.stderr @@ -5,7 +5,7 @@ LL | p = &x; | ^ borrowed value does not live long enough LL | } | - `x` dropped here while still borrowed -23 | //~^^ ERROR `x` does not live long enough +LL | //~^^ ERROR `x` does not live long enough LL | } | - borrowed value needs to live until here diff --git a/src/test/ui/span/regions-escape-loop-via-vec.stderr b/src/test/ui/span/regions-escape-loop-via-vec.stderr index 34db3095d72..2cb8df235b4 100644 --- a/src/test/ui/span/regions-escape-loop-via-vec.stderr +++ b/src/test/ui/span/regions-escape-loop-via-vec.stderr @@ -22,7 +22,7 @@ error[E0503]: cannot use `x` because it was mutably borrowed | LL | let mut _y = vec![&mut x]; | - borrow of `x` occurs here -15 | while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed +LL | while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed LL | let mut z = x; //~ ERROR cannot use `x` because it was mutably borrowed | ^^^^^ use of borrowed `x` diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr b/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr index 749ccf65783..42240509a9e 100644 --- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr +++ b/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr @@ -6,7 +6,7 @@ LL | y = borrow(&*x); ... LL | } | - `*x` dropped here while still borrowed -30 | assert!(*y != 0); +LL | assert!(*y != 0); LL | } | - borrowed value needs to live until here diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.stderr b/src/test/ui/span/send-is-not-static-std-sync-2.stderr index 5c3e38db2a3..ed6363a2e33 100644 --- a/src/test/ui/span/send-is-not-static-std-sync-2.stderr +++ b/src/test/ui/span/send-is-not-static-std-sync-2.stderr @@ -25,7 +25,7 @@ error[E0597]: `x` does not live long enough | LL | let _ = tx.send(&x); | ^ borrowed value does not live long enough -42 | (tx, rx) +LL | (tx, rx) LL | }; | - `x` dropped here while still borrowed ... diff --git a/src/test/ui/span/send-is-not-static-std-sync.stderr b/src/test/ui/span/send-is-not-static-std-sync.stderr index 3fcb145579d..ffaccf010a9 100644 --- a/src/test/ui/span/send-is-not-static-std-sync.stderr +++ b/src/test/ui/span/send-is-not-static-std-sync.stderr @@ -5,7 +5,7 @@ LL | *lock.lock().unwrap() = &z; | ^ borrowed value does not live long enough LL | } | - `z` dropped here while still borrowed -28 | //~^^ ERROR `z` does not live long enough +LL | //~^^ ERROR `z` does not live long enough LL | } | - borrowed value needs to live until here @@ -24,7 +24,7 @@ LL | *lock.write().unwrap() = &z; | ^ borrowed value does not live long enough LL | } | - `z` dropped here while still borrowed -41 | //~^^ ERROR `z` does not live long enough +LL | //~^^ ERROR `z` does not live long enough LL | } | - borrowed value needs to live until here @@ -43,7 +43,7 @@ LL | tx.send(&z).unwrap(); | ^ borrowed value does not live long enough LL | } | - `z` dropped here while still borrowed -56 | //~^^ ERROR `z` does not live long enough +LL | //~^^ ERROR `z` does not live long enough LL | } | - borrowed value needs to live until here diff --git a/src/test/ui/span/slice-borrow.stderr b/src/test/ui/span/slice-borrow.stderr index 67c432a823a..3cc791a0580 100644 --- a/src/test/ui/span/slice-borrow.stderr +++ b/src/test/ui/span/slice-borrow.stderr @@ -3,7 +3,7 @@ error[E0597]: borrowed value does not live long enough | LL | let x: &[isize] = &vec![1, 2, 3, 4, 5]; | ^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough -17 | y = &x[1..]; +LL | y = &x[1..]; LL | } | - temporary value dropped here while still borrowed LL | } diff --git a/src/test/ui/span/unused-warning-point-at-signature.stderr b/src/test/ui/span/unused-warning-point-at-signature.stderr index 1c5ff7c8bc3..de234344d84 100644 --- a/src/test/ui/span/unused-warning-point-at-signature.stderr +++ b/src/test/ui/span/unused-warning-point-at-signature.stderr @@ -30,7 +30,7 @@ LL | / fn //~ WARN function is never used LL | | func_complete_span() LL | | -> usize LL | | { -37 | | 3 +LL | | 3 LL | | } | |_^ diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr b/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr index 5a8751b4626..f9a94290603 100644 --- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr +++ b/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr @@ -14,7 +14,7 @@ error[E0597]: `c1` does not live long enough | LL | c2.v[0].v.set(Some(&c1)); | ^^ borrowed value does not live long enough -130| //~^ ERROR `c1` does not live long enough +LL | //~^ ERROR `c1` does not live long enough LL | } | - `c1` dropped here while still borrowed | diff --git a/src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr b/src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr index ebc20ebb42f..c9babb6a6d9 100644 --- a/src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr +++ b/src/test/ui/suggestions/issue-32354-suggest-import-rename.stderr @@ -9,7 +9,7 @@ LL | use extension2::ConstructorExtension; //~ ERROR is defined multiple times = note: `ConstructorExtension` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -20 | use extension2::ConstructorExtension as OtherConstructorExtension; //~ ERROR is defined multiple times +LL | use extension2::ConstructorExtension as OtherConstructorExtension; //~ ERROR is defined multiple times | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr b/src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr index f7a1204bf81..22c82be100c 100644 --- a/src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr +++ b/src/test/ui/suggestions/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr @@ -7,7 +7,7 @@ LL | extern crate std; = note: `std` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -11 | extern crate std as other_std; +LL | extern crate std as other_std; | error: aborting due to previous error diff --git a/src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr b/src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr index f4372fe35f2..ddd38ca5c3c 100644 --- a/src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr +++ b/src/test/ui/suggestions/method-on-ambiguous-numeric-type.stderr @@ -5,7 +5,7 @@ LL | let x = 2.0.powi(2); | ^^^^ help: you must specify a concrete type for this numeric value, like `f32` | -12 | let x = 2.0_f32.powi(2); +LL | let x = 2.0_f32.powi(2); | ^^^^^^^ error[E0689]: can't call method `powi` on ambiguous numeric type `{float}` @@ -15,7 +15,7 @@ LL | let x = y.powi(2); | ^^^^ help: you must specify a type for this binding, like `f32` | -14 | let y: f32 = 2.0; +LL | let y: f32 = 2.0; | ^^^^^^ error: aborting due to 2 previous errors diff --git a/src/test/ui/suggestions/numeric-cast.stderr b/src/test/ui/suggestions/numeric-cast.stderr index b06216e613e..a19ca7de4b0 100644 --- a/src/test/ui/suggestions/numeric-cast.stderr +++ b/src/test/ui/suggestions/numeric-cast.stderr @@ -143,7 +143,7 @@ LL | foo::<u64>(x_u32); | ^^^^^ expected u64, found u32 help: you can cast an `u32` to `u64`, which will zero-extend the source value | -79 | foo::<u64>(x_u32.into()); +LL | foo::<u64>(x_u32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -153,7 +153,7 @@ LL | foo::<u64>(x_u16); | ^^^^^ expected u64, found u16 help: you can cast an `u16` to `u64`, which will zero-extend the source value | -81 | foo::<u64>(x_u16.into()); +LL | foo::<u64>(x_u16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -163,7 +163,7 @@ LL | foo::<u64>(x_u8); | ^^^^ expected u64, found u8 help: you can cast an `u8` to `u64`, which will zero-extend the source value | -83 | foo::<u64>(x_u8.into()); +LL | foo::<u64>(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -251,7 +251,7 @@ LL | foo::<i64>(x_i32); | ^^^^^ expected i64, found i32 help: you can cast an `i32` to `i64`, which will sign-extend the source value | -113| foo::<i64>(x_i32.into()); +LL | foo::<i64>(x_i32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -261,7 +261,7 @@ LL | foo::<i64>(x_i16); | ^^^^^ expected i64, found i16 help: you can cast an `i16` to `i64`, which will sign-extend the source value | -115| foo::<i64>(x_i16.into()); +LL | foo::<i64>(x_i16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -271,7 +271,7 @@ LL | foo::<i64>(x_i8); | ^^^^ expected i64, found i8 help: you can cast an `i8` to `i64`, which will sign-extend the source value | -117| foo::<i64>(x_i8.into()); +LL | foo::<i64>(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -305,7 +305,7 @@ LL | foo::<u32>(x_u16); | ^^^^^ expected u32, found u16 help: you can cast an `u16` to `u32`, which will zero-extend the source value | -129| foo::<u32>(x_u16.into()); +LL | foo::<u32>(x_u16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -315,7 +315,7 @@ LL | foo::<u32>(x_u8); | ^^^^ expected u32, found u8 help: you can cast an `u8` to `u32`, which will zero-extend the source value | -131| foo::<u32>(x_u8.into()); +LL | foo::<u32>(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -409,7 +409,7 @@ LL | foo::<i32>(x_i16); | ^^^^^ expected i32, found i16 help: you can cast an `i16` to `i32`, which will sign-extend the source value | -163| foo::<i32>(x_i16.into()); +LL | foo::<i32>(x_i16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -419,7 +419,7 @@ LL | foo::<i32>(x_i8); | ^^^^ expected i32, found i8 help: you can cast an `i8` to `i32`, which will sign-extend the source value | -165| foo::<i32>(x_i8.into()); +LL | foo::<i32>(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -459,7 +459,7 @@ LL | foo::<u16>(x_u8); | ^^^^ expected u16, found u8 help: you can cast an `u8` to `u16`, which will zero-extend the source value | -179| foo::<u16>(x_u8.into()); +LL | foo::<u16>(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -559,7 +559,7 @@ LL | foo::<i16>(x_i8); | ^^^^ expected i16, found i8 help: you can cast an `i8` to `i16`, which will sign-extend the source value | -213| foo::<i16>(x_i8.into()); +LL | foo::<i16>(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -725,7 +725,7 @@ LL | foo::<f64>(x_u32); | ^^^^^ expected f64, found u32 help: you can cast an `u32` to `f64`, producing the floating point representation of the integer | -272| foo::<f64>(x_u32.into()); +LL | foo::<f64>(x_u32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -735,7 +735,7 @@ LL | foo::<f64>(x_u16); | ^^^^^ expected f64, found u16 help: you can cast an `u16` to `f64`, producing the floating point representation of the integer | -274| foo::<f64>(x_u16.into()); +LL | foo::<f64>(x_u16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -745,7 +745,7 @@ LL | foo::<f64>(x_u8); | ^^^^ expected f64, found u8 help: you can cast an `u8` to `f64`, producing the floating point representation of the integer | -276| foo::<f64>(x_u8.into()); +LL | foo::<f64>(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -767,7 +767,7 @@ LL | foo::<f64>(x_i32); | ^^^^^ expected f64, found i32 help: you can cast an `i32` to `f64`, producing the floating point representation of the integer | -282| foo::<f64>(x_i32.into()); +LL | foo::<f64>(x_i32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -777,7 +777,7 @@ LL | foo::<f64>(x_i16); | ^^^^^ expected f64, found i16 help: you can cast an `i16` to `f64`, producing the floating point representation of the integer | -284| foo::<f64>(x_i16.into()); +LL | foo::<f64>(x_i16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -787,7 +787,7 @@ LL | foo::<f64>(x_i8); | ^^^^ expected f64, found i8 help: you can cast an `i8` to `f64`, producing the floating point representation of the integer | -286| foo::<f64>(x_i8.into()); +LL | foo::<f64>(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -797,7 +797,7 @@ LL | foo::<f64>(x_f32); | ^^^^^ expected f64, found f32 help: you can cast an `f32` to `f64` in a lossless way | -289| foo::<f64>(x_f32.into()); +LL | foo::<f64>(x_f32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -825,7 +825,7 @@ LL | foo::<f32>(x_u16); | ^^^^^ expected f32, found u16 help: you can cast an `u16` to `f32`, producing the floating point representation of the integer | -298| foo::<f32>(x_u16.into()); +LL | foo::<f32>(x_u16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -835,7 +835,7 @@ LL | foo::<f32>(x_u8); | ^^^^ expected f32, found u8 help: you can cast an `u8` to `f32`, producing the floating point representation of the integer | -300| foo::<f32>(x_u8.into()); +LL | foo::<f32>(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -863,7 +863,7 @@ LL | foo::<f32>(x_i16); | ^^^^^ expected f32, found i16 help: you can cast an `i16` to `f32`, producing the floating point representation of the integer | -308| foo::<f32>(x_i16.into()); +LL | foo::<f32>(x_i16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types @@ -873,7 +873,7 @@ LL | foo::<f32>(x_i8); | ^^^^ expected f32, found i8 help: you can cast an `i8` to `f32`, producing the floating point representation of the integer | -310| foo::<f32>(x_i8.into()); +LL | foo::<f32>(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types @@ -889,7 +889,7 @@ LL | foo::<u32>(x_u8 as u16); | ^^^^^^^^^^^ expected u32, found u16 help: you can cast an `u16` to `u32`, which will zero-extend the source value | -316| foo::<u32>((x_u8 as u16).into()); +LL | foo::<u32>((x_u8 as u16).into()); | ^^^^^^^^^^^^^^^^^^^^ error[E0308]: mismatched types @@ -899,7 +899,7 @@ LL | foo::<i32>(-x_i8); | ^^^^^ expected i32, found i8 help: you can cast an `i8` to `i32`, which will sign-extend the source value | -318| foo::<i32>((-x_i8).into()); +LL | foo::<i32>((-x_i8).into()); | ^^^^^^^^^^^^^^ error: aborting due to 134 previous errors diff --git a/src/test/ui/suggestions/pub-ident-fn-2.stderr b/src/test/ui/suggestions/pub-ident-fn-2.stderr index 5539ac55f6d..bbbb3df8769 100644 --- a/src/test/ui/suggestions/pub-ident-fn-2.stderr +++ b/src/test/ui/suggestions/pub-ident-fn-2.stderr @@ -5,7 +5,7 @@ LL | pub foo(s: usize) { bar() } | ^ help: add `fn` here to parse `foo` as a public method | -11 | pub fn foo(s: usize) { bar() } +LL | pub fn foo(s: usize) { bar() } | ^^ error: aborting due to previous error diff --git a/src/test/ui/suggestions/pub-ident-fn.stderr b/src/test/ui/suggestions/pub-ident-fn.stderr index f26823f22d7..de7ee71d1b4 100644 --- a/src/test/ui/suggestions/pub-ident-fn.stderr +++ b/src/test/ui/suggestions/pub-ident-fn.stderr @@ -5,7 +5,7 @@ LL | pub foo(s: usize) -> bool { true } | ^^^ help: add `fn` here to parse `foo` as a public method | -11 | pub fn foo(s: usize) -> bool { true } +LL | pub fn foo(s: usize) -> bool { true } | ^^ error: aborting due to previous error diff --git a/src/test/ui/suggestions/pub-ident-struct.stderr b/src/test/ui/suggestions/pub-ident-struct.stderr index 19807d71f28..cd53cea7212 100644 --- a/src/test/ui/suggestions/pub-ident-struct.stderr +++ b/src/test/ui/suggestions/pub-ident-struct.stderr @@ -5,7 +5,7 @@ LL | pub S { | ^ help: add `struct` here to parse `S` as a public struct | -11 | pub struct S { +LL | pub struct S { | ^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/suggestions/return-type.stderr b/src/test/ui/suggestions/return-type.stderr index 372d79b020d..b09615a2fa6 100644 --- a/src/test/ui/suggestions/return-type.stderr +++ b/src/test/ui/suggestions/return-type.stderr @@ -8,11 +8,11 @@ LL | foo(4 as usize) found type `S<usize>` help: try adding a semicolon | -20 | foo(4 as usize); +LL | foo(4 as usize); | ^ help: try adding a return type | -19 | fn bar() -> S<usize> { +LL | fn bar() -> S<usize> { | ^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/suggestions/str-as-char.stderr b/src/test/ui/suggestions/str-as-char.stderr index f7d3eeb47f1..d881becf00c 100644 --- a/src/test/ui/suggestions/str-as-char.stderr +++ b/src/test/ui/suggestions/str-as-char.stderr @@ -5,7 +5,7 @@ LL | println!('●●'); | ^^^^ help: if you meant to write a `str` literal, use double quotes | -12 | println!("●●"); +LL | println!("●●"); | ^^^^ error: aborting due to previous error diff --git a/src/test/ui/token/issue-15980.stderr b/src/test/ui/token/issue-15980.stderr index 2b91a546423..4078797474e 100644 --- a/src/test/ui/token/issue-15980.stderr +++ b/src/test/ui/token/issue-15980.stderr @@ -3,7 +3,7 @@ error: expected identifier, found keyword `return` | LL | Err(ref e) if e.kind == io::EndOfFile { | ------------- while parsing this struct -19 | //~^ NOTE while parsing this struct +LL | //~^ NOTE while parsing this struct LL | return | ^^^^^^ expected identifier, found keyword @@ -12,7 +12,7 @@ error: expected one of `.`, `=>`, `?`, or an operator, found `_` | LL | } | - expected one of `.`, `=>`, `?`, or an operator here -24 | //~^ NOTE expected one of `.`, `=>`, `?`, or an operator here +LL | //~^ NOTE expected one of `.`, `=>`, `?`, or an operator here LL | _ => {} | ^ unexpected token diff --git a/src/test/ui/trait-method-private.stderr b/src/test/ui/trait-method-private.stderr index c1e0c86a452..f89da4d4bf2 100644 --- a/src/test/ui/trait-method-private.stderr +++ b/src/test/ui/trait-method-private.stderr @@ -7,7 +7,7 @@ LL | foo.method(); //~ ERROR is private = help: items from traits can only be used if the trait is in scope help: the following trait is implemented but not in scope, perhaps add a `use` for it: | -11 | use inner::Bar; +LL | use inner::Bar; | error: aborting due to previous error diff --git a/src/test/ui/type-check/issue-40294.stderr b/src/test/ui/type-check/issue-40294.stderr index 3c141ec79c7..1eb1f8effbb 100644 --- a/src/test/ui/type-check/issue-40294.stderr +++ b/src/test/ui/type-check/issue-40294.stderr @@ -5,7 +5,7 @@ LL | / fn foo<'a,'b,T>(x: &'a T, y: &'b T) //~ ERROR type annotations required LL | | where &'a T : Foo, LL | | &'b T : Foo LL | | { -19 | | x.foo(); +LL | | x.foo(); LL | | y.foo(); LL | | } | |_^ diff --git a/src/test/ui/type-recursive.stderr b/src/test/ui/type-recursive.stderr index 290f796602c..ea90feee324 100644 --- a/src/test/ui/type-recursive.stderr +++ b/src/test/ui/type-recursive.stderr @@ -3,7 +3,7 @@ error[E0072]: recursive type `t1` has infinite size | LL | struct t1 { //~ ERROR E0072 | ^^^^^^^^^ recursive type has infinite size -12 | foo: isize, +LL | foo: isize, LL | foolish: t1 | ----------- recursive without indirection | diff --git a/src/test/ui/use-mod.stderr b/src/test/ui/use-mod.stderr index 40ae194c3c5..0a63f370d97 100644 --- a/src/test/ui/use-mod.stderr +++ b/src/test/ui/use-mod.stderr @@ -25,7 +25,7 @@ LL | self = note: `bar` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -15 | self as other_bar +LL | self as other_bar | error: aborting due to 3 previous errors |