diff options
| author | klensy <klensy@users.noreply.github.com> | 2022-06-08 21:07:59 +0300 |
|---|---|---|
| committer | klensy <klensy@users.noreply.github.com> | 2022-06-16 14:40:29 +0300 |
| commit | 989d1a732f194d852e9a3636fc283c65612f995f (patch) | |
| tree | f530eaa413fae5cc347e3c0f22d31b6ae2aabf39 | |
| parent | 0ff8ae3111939a30d61f158b53e120f965989520 (diff) | |
| download | rust-989d1a732f194d852e9a3636fc283c65612f995f.tar.gz rust-989d1a732f194d852e9a3636fc283c65612f995f.zip | |
fix one more case of trailing space
105 files changed, 140 insertions, 140 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 5f0ad42c17a..06a1a31c672 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -819,7 +819,7 @@ impl EmitterWriter { } buffer.puts(line_offset, 0, &self.maybe_anonymized(line_index), Style::LineNumber); - draw_col_separator(buffer, line_offset, width_offset - 2); + draw_col_separator_no_space(buffer, line_offset, width_offset - 2); } fn render_source_line( diff --git a/src/test/ui/associated-types/defaults-specialization.stderr b/src/test/ui/associated-types/defaults-specialization.stderr index aa8841fbaae..2d61b2a647b 100644 --- a/src/test/ui/associated-types/defaults-specialization.stderr +++ b/src/test/ui/associated-types/defaults-specialization.stderr @@ -30,7 +30,7 @@ error[E0053]: method `make` has an incompatible type for trait | LL | default type Ty = bool; | ----------------------- expected this associated type -LL | +LL | LL | fn make() -> bool { true } | ^^^^ | | @@ -50,7 +50,7 @@ error[E0308]: mismatched types | LL | type Ty = u8; | ------------- associated type defaults can't be assumed inside the trait defining them -LL | +LL | LL | fn make() -> Self::Ty { | -------- expected `<Self as Tr>::Ty` because of return type LL | 0u8 @@ -77,7 +77,7 @@ error[E0308]: mismatched types | LL | default type Ty = bool; | ----------------------- expected this associated type -LL | +LL | LL | fn make() -> Self::Ty { true } | -------- ^^^^ expected associated type, found `bool` | | diff --git a/src/test/ui/associated-types/issue-22560.stderr b/src/test/ui/associated-types/issue-22560.stderr index c5c70f226fd..71655d54baa 100644 --- a/src/test/ui/associated-types/issue-22560.stderr +++ b/src/test/ui/associated-types/issue-22560.stderr @@ -5,7 +5,7 @@ LL | / trait Sub<Rhs=Self> { LL | | type Output; LL | | } | |_- type parameter `Rhs` must be specified for this -LL | +LL | LL | type Test = dyn Add + Sub; | ^^^ help: set the type parameter to the desired type: `Sub<Rhs>` | diff --git a/src/test/ui/async-await/issue-67765-async-diagnostic.stderr b/src/test/ui/async-await/issue-67765-async-diagnostic.stderr index 832b736ad86..492e06fbbc0 100644 --- a/src/test/ui/async-await/issue-67765-async-diagnostic.stderr +++ b/src/test/ui/async-await/issue-67765-async-diagnostic.stderr @@ -3,7 +3,7 @@ error[E0515]: cannot return value referencing local variable `s` | LL | let b = &s[..]; | - `s` is borrowed here -LL | +LL | LL | Err(b)?; | ^^^^^^^ returns a value referencing data owned by the current function diff --git a/src/test/ui/blind/blind-item-item-shadow.stderr b/src/test/ui/blind/blind-item-item-shadow.stderr index 12b583ea3e9..7f9e8008929 100644 --- a/src/test/ui/blind/blind-item-item-shadow.stderr +++ b/src/test/ui/blind/blind-item-item-shadow.stderr @@ -3,7 +3,7 @@ error[E0255]: the name `foo` is defined multiple times | LL | mod foo { pub mod foo { } } | ------- previous definition of the module `foo` here -LL | +LL | LL | use foo::foo; | ^^^^^^^^ `foo` reimported here | diff --git a/src/test/ui/borrowck/borrow-raw-address-of-borrowed.stderr b/src/test/ui/borrowck/borrow-raw-address-of-borrowed.stderr index ff461b748be..6f7b7e08070 100644 --- a/src/test/ui/borrowck/borrow-raw-address-of-borrowed.stderr +++ b/src/test/ui/borrowck/borrow-raw-address-of-borrowed.stderr @@ -3,10 +3,10 @@ error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immuta | LL | let y = &x; | -- immutable borrow occurs here -LL | +LL | LL | let q = &raw mut x; | ^^^^^^^^^^ mutable borrow occurs here -LL | +LL | LL | drop(y); | - immutable borrow later used here @@ -15,7 +15,7 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as muta | LL | let y = &mut x; | ------ mutable borrow occurs here -LL | +LL | LL | let p = &raw const x; | ^^^^^^^^^^^^ immutable borrow occurs here ... @@ -30,7 +30,7 @@ LL | let y = &mut x; ... LL | let q = &raw mut x; | ^^^^^^^^^^ second mutable borrow occurs here -LL | +LL | LL | drop(y); | - first borrow later used here diff --git a/src/test/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr b/src/test/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr index 31af38507c7..5963dab9f4a 100644 --- a/src/test/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr +++ b/src/test/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr @@ -3,7 +3,7 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference | LL | let x = &0; | -- help: consider changing this to be a mutable reference: `&mut 0` -LL | +LL | LL | let q = &raw mut *x; | ^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable @@ -12,7 +12,7 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `*const` pointer | LL | let x = &0 as *const i32; | -- help: consider changing this to be a mutable pointer: `&mut 0` -LL | +LL | LL | let q = &raw mut *x; | ^^^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable diff --git a/src/test/ui/borrowck/borrow-tuple-fields.stderr b/src/test/ui/borrowck/borrow-tuple-fields.stderr index ad628abcbfc..befa751a600 100644 --- a/src/test/ui/borrowck/borrow-tuple-fields.stderr +++ b/src/test/ui/borrowck/borrow-tuple-fields.stderr @@ -5,7 +5,7 @@ LL | let r = &x.0; | ---- borrow of `x.0` occurs here LL | let y = x; | ^ move out of `x` occurs here -LL | +LL | LL | r.use_ref(); | ----------- borrow later used here diff --git a/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr b/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr index 93f1d8c5258..b80174ae687 100644 --- a/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr +++ b/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr @@ -3,10 +3,10 @@ error[E0502]: cannot borrow `p` as mutable because it is also borrowed as immuta | LL | let q: &isize = &p[0]; | - immutable borrow occurs here -LL | +LL | LL | p[0] = 5; | ^ mutable borrow occurs here -LL | +LL | LL | println!("{}", *q); | -- immutable borrow later used here diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr index 1d8d04c9181..24cc4933ef1 100644 --- a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr +++ b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr @@ -3,7 +3,7 @@ error[E0503]: cannot use `p` because it was mutably borrowed | LL | let q = &mut p; | ------ borrow of `p` occurs here -LL | +LL | LL | p + 3; | ^ use of borrowed `p` ... @@ -18,7 +18,7 @@ LL | let q = &mut p; ... LL | p.times(3); | ^^^^^^^^^^ immutable borrow occurs here -LL | +LL | LL | *q + 3; // OK to use the new alias `q` | -- mutable borrow later used here diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr.stderr index 74cad575d27..1d6bd4e2ec8 100644 --- a/src/test/ui/borrowck/borrowck-loan-rcvr.stderr +++ b/src/test/ui/borrowck/borrowck-loan-rcvr.stderr @@ -18,7 +18,7 @@ LL | let l = &mut p; | ------ mutable borrow occurs here LL | p.impurem(); | ^^^^^^^^^^^ immutable borrow occurs here -LL | +LL | LL | l.x += 1; | -------- mutable borrow later used here diff --git a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr index b305e3c0a16..f833abcc02a 100644 --- a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr +++ b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr @@ -3,7 +3,7 @@ error[E0505]: cannot move out of `*a` because it is borrowed | LL | let b = &a; | -- borrow of `a` occurs here -LL | +LL | LL | let z = *a; | ^^ move out of `*a` occurs here LL | b.use_ref(); diff --git a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.stderr b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.stderr index edd597fe30b..9509ebb7cde 100644 --- a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.stderr +++ b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.stderr @@ -3,7 +3,7 @@ error[E0382]: use of moved value: `t` | LL | let t: Box<_> = Box::new(3); | - move occurs because `t` has type `Box<isize>`, which does not implement the `Copy` trait -LL | +LL | LL | call_f(move|| { *t + 1 }); | ------ -- variable moved due to use in closure | | diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr index bacad399ebe..e01c26adcfc 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr @@ -3,7 +3,7 @@ error[E0505]: cannot move out of `s` because it is borrowed | LL | let rs = &mut s; | ------ borrow of `s` occurs here -LL | +LL | LL | println!("{}", f[s]); | ^ move out of `s` occurs here ... diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array.stderr b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array.stderr index 0432aaf51d2..b8ac7a3a446 100644 --- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array.stderr +++ b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-array.stderr @@ -23,7 +23,7 @@ error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as im | LL | let [.., _, ref from_end4, ref from_end3, _, ref from_end1] = *s; | ------------- immutable borrow occurs here -LL | +LL | LL | let [_, _, ref mut from_begin2, ..] = *s; | ^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here LL | nop(&[from_begin2, from_end1, from_end3, from_end4]); @@ -45,7 +45,7 @@ error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as im | LL | let [ref from_begin0, ref from_begin1, _, ref from_begin3, _, ..] = *s; | --------------- immutable borrow occurs here -LL | +LL | LL | let [.., ref mut from_end3, _, _] = *s; | ^^^^^^^^^^^^^^^^^ mutable borrow occurs here LL | nop(&[from_begin0, from_begin1, from_begin3, from_end3]); diff --git a/src/test/ui/borrowck/borrowck-union-borrow.stderr b/src/test/ui/borrowck/borrowck-union-borrow.stderr index 395cd0b4855..090c7b6b51a 100644 --- a/src/test/ui/borrowck/borrowck-union-borrow.stderr +++ b/src/test/ui/borrowck/borrowck-union-borrow.stderr @@ -99,7 +99,7 @@ LL | let ra = &mut u.a; | -------- borrow of `u.a` occurs here LL | let b = u.b; | ^^^ use of borrowed `u.a` -LL | +LL | LL | drop(ra); | -- borrow later used here diff --git a/src/test/ui/borrowck/copy-suggestion-region-vid.stderr b/src/test/ui/borrowck/copy-suggestion-region-vid.stderr index f03cdd84d75..1685acf8718 100644 --- a/src/test/ui/borrowck/copy-suggestion-region-vid.stderr +++ b/src/test/ui/borrowck/copy-suggestion-region-vid.stderr @@ -3,7 +3,7 @@ error[E0382]: borrow of moved value: `helpers` | LL | let helpers = [vec![], vec![]]; | ------- move occurs because `helpers` has type `[Vec<&i64>; 2]`, which does not implement the `Copy` trait -LL | +LL | LL | HelperStruct { helpers, is_empty: helpers[0].is_empty() } | ------- ^^^^^^^^^^^^^^^^^^^^^ value borrowed here after move | | diff --git a/src/test/ui/borrowck/issue-58776-borrowck-scans-children.stderr b/src/test/ui/borrowck/issue-58776-borrowck-scans-children.stderr index 9b1d6fa7d35..57803247ba8 100644 --- a/src/test/ui/borrowck/issue-58776-borrowck-scans-children.stderr +++ b/src/test/ui/borrowck/issue-58776-borrowck-scans-children.stderr @@ -5,7 +5,7 @@ LL | let res = (|| (|| &greeting)())(); | -- -------- borrow occurs due to use in closure | | | borrow of `greeting` occurs here -LL | +LL | LL | greeting = "DEALLOCATED".to_string(); | ^^^^^^^^ assignment to borrowed `greeting` occurs here ... diff --git a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr b/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr index a6c65421d91..a57ceb84739 100644 --- a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr +++ b/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr @@ -3,7 +3,7 @@ error[E0503]: cannot use `i` because it was mutably borrowed | LL | /*1*/ let p = &mut i; // (reservation of `i` starts here) | ------ borrow of `i` occurs here -LL | +LL | LL | /*2*/ let j = i; // OK: `i` is only reserved here | ^ use of borrowed `i` ... diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr index e4dc4dc5999..9e0f68b6543 100644 --- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr +++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr @@ -3,7 +3,7 @@ error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immuta | LL | let shared = &v; | -- immutable borrow occurs here -LL | +LL | LL | v.extend(shared); | ^^------^^^^^^^^ | | | diff --git a/src/test/ui/borrowck/two-phase-sneaky.stderr b/src/test/ui/borrowck/two-phase-sneaky.stderr index 0dbed98b841..117d7ceaeef 100644 --- a/src/test/ui/borrowck/two-phase-sneaky.stderr +++ b/src/test/ui/borrowck/two-phase-sneaky.stderr @@ -5,7 +5,7 @@ LL | v[0].push_str({ | - -------- first borrow later used by call | | | first mutable borrow occurs here -LL | +LL | LL | v.push(format!("foo")); | ^^^^^^^^^^^^^^^^^^^^^^ second mutable borrow occurs here diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/mut_ref.stderr b/src/test/ui/closures/2229_closure_analysis/diagnostics/mut_ref.stderr index dbf8523a3ba..481d7e58529 100644 --- a/src/test/ui/closures/2229_closure_analysis/diagnostics/mut_ref.stderr +++ b/src/test/ui/closures/2229_closure_analysis/diagnostics/mut_ref.stderr @@ -3,7 +3,7 @@ error[E0596]: cannot borrow `**ref_mref_x` as mutable, as it is behind a `&` ref | LL | let ref_mref_x = &mref_x; | ------- help: consider changing this to be a mutable reference: `&mut mref_x` -LL | +LL | LL | let c = || { | ^^ `ref_mref_x` is a `&` reference, so the data it refers to cannot be borrowed as mutable LL | diff --git a/src/test/ui/closures/issue-6801.stderr b/src/test/ui/closures/issue-6801.stderr index 48c6acd1f49..6a40db0d51d 100644 --- a/src/test/ui/closures/issue-6801.stderr +++ b/src/test/ui/closures/issue-6801.stderr @@ -5,7 +5,7 @@ LL | let sq = || { *x * *x }; | -- -- borrow occurs due to use in closure | | | borrow of `x` occurs here -LL | +LL | LL | twice(x); | ^ move out of `x` occurs here LL | invoke(sq); diff --git a/src/test/ui/closures/issue-82438-mut-without-upvar.stderr b/src/test/ui/closures/issue-82438-mut-without-upvar.stderr index 06e2b5d0c1b..802284b2658 100644 --- a/src/test/ui/closures/issue-82438-mut-without-upvar.stderr +++ b/src/test/ui/closures/issue-82438-mut-without-upvar.stderr @@ -3,7 +3,7 @@ error[E0596]: cannot borrow `c` as mutable, as it is not declared as mutable | LL | let c = |a, b, c, d| {}; | - help: consider changing this to be mutable: `mut c` -LL | +LL | LL | A.f(participant_name, &mut c); | ^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr index 5295170cd8b..1110197734f 100644 --- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr +++ b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr @@ -3,7 +3,7 @@ error[E0751]: found both positive and negative implementation of trait `std::mar | LL | unsafe impl<T: MyTrait + 'static> Send for TestType<T> {} | ------------------------------------------------------ positive implementation here -LL | +LL | LL | impl<T: MyTrait> !Send for TestType<T> {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ negative implementation here diff --git a/src/test/ui/coherence/coherence-fn-implied-bounds.stderr b/src/test/ui/coherence/coherence-fn-implied-bounds.stderr index c8accc99747..8612ce60d18 100644 --- a/src/test/ui/coherence/coherence-fn-implied-bounds.stderr +++ b/src/test/ui/coherence/coherence-fn-implied-bounds.stderr @@ -3,7 +3,7 @@ error: conflicting implementations of trait `Trait` for type `for<'a, 'b> fn(&'a | LL | impl Trait for for<'a, 'b> fn(&'a &'b u32, &'b &'a u32) -> &'b u32 {} | ------------------------------------------------------------------ first implementation here -LL | +LL | LL | impl Trait for for<'c> fn(&'c &'c u32, &'c &'c u32) -> &'c u32 { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a &'b u32, &'b &'a u32) -> &'b u32` | diff --git a/src/test/ui/coherence/coherence-free-vs-bound-region.stderr b/src/test/ui/coherence/coherence-free-vs-bound-region.stderr index c249fa43c3b..af18655b06f 100644 --- a/src/test/ui/coherence/coherence-free-vs-bound-region.stderr +++ b/src/test/ui/coherence/coherence-free-vs-bound-region.stderr @@ -3,7 +3,7 @@ error: conflicting implementations of trait `TheTrait` for type `fn(&u8)` | LL | impl<'a> TheTrait for fn(&'a u8) {} | -------------------------------- first implementation here -LL | +LL | LL | impl TheTrait for fn(&u8) { | ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `fn(&u8)` | diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr b/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr index 9efb5dc75f4..8e7d4589e61 100644 --- a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr +++ b/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr @@ -3,7 +3,7 @@ error[E0119]: conflicting implementations of trait `Foo<i32>` for type `i32` | LL | impl Foo<i32> for i32 { } | --------------------- first implementation here -LL | +LL | LL | impl<A:Iterator> Foo<A::Item> for A { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32` | diff --git a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr b/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr index 85d3d358f83..6492747bb26 100644 --- a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr +++ b/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr @@ -3,7 +3,7 @@ error[E0119]: conflicting implementations of trait `Foo<_>` for type `std::optio | LL | impl <P, T: Foo<P>> Foo<P> for Option<T> {} | ---------------------------------------- first implementation here -LL | +LL | LL | impl<T, U> Foo<T> for Option<U> { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `std::option::Option<_>` diff --git a/src/test/ui/coherence/coherence-projection-conflict.stderr b/src/test/ui/coherence/coherence-projection-conflict.stderr index e7d1fb29346..7d2c584c370 100644 --- a/src/test/ui/coherence/coherence-projection-conflict.stderr +++ b/src/test/ui/coherence/coherence-projection-conflict.stderr @@ -3,7 +3,7 @@ error[E0119]: conflicting implementations of trait `Foo<i32>` for type `i32` | LL | impl Foo<i32> for i32 { } | --------------------- first implementation here -LL | +LL | LL | impl<A:Bar> Foo<A::Output> for A { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32` diff --git a/src/test/ui/coherence/coherence-subtyping.stderr b/src/test/ui/coherence/coherence-subtyping.stderr index 6f95f0a06b5..25d8c875653 100644 --- a/src/test/ui/coherence/coherence-subtyping.stderr +++ b/src/test/ui/coherence/coherence-subtyping.stderr @@ -3,7 +3,7 @@ warning: conflicting implementations of trait `TheTrait` for type `for<'a, 'b> f | LL | impl TheTrait for for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8 {} | ---------------------------------------------------------- first implementation here -LL | +LL | LL | impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8` | diff --git a/src/test/ui/derives/issue-91550.stderr b/src/test/ui/derives/issue-91550.stderr index 1b26d754984..c94d566f5df 100644 --- a/src/test/ui/derives/issue-91550.stderr +++ b/src/test/ui/derives/issue-91550.stderr @@ -23,7 +23,7 @@ error[E0599]: the method `use_eq` exists for struct `Object<NoDerives>`, but its | LL | pub struct NoDerives; | --------------------- doesn't satisfy `NoDerives: Eq` -LL | +LL | LL | struct Object<T>(T); | -------------------- method `use_eq` not found for this ... @@ -42,7 +42,7 @@ error[E0599]: the method `use_ord` exists for struct `Object<NoDerives>`, but it | LL | pub struct NoDerives; | --------------------- doesn't satisfy `NoDerives: Ord` -LL | +LL | LL | struct Object<T>(T); | -------------------- method `use_ord` not found for this ... @@ -64,7 +64,7 @@ LL | pub struct NoDerives; | | | doesn't satisfy `NoDerives: Ord` | doesn't satisfy `NoDerives: PartialOrd` -LL | +LL | LL | struct Object<T>(T); | -------------------- method `use_ord_and_partial_ord` not found for this ... diff --git a/src/test/ui/error-codes/E0255.stderr b/src/test/ui/error-codes/E0255.stderr index b5c09499276..352c5ba5be0 100644 --- a/src/test/ui/error-codes/E0255.stderr +++ b/src/test/ui/error-codes/E0255.stderr @@ -3,7 +3,7 @@ error[E0255]: the name `foo` is defined multiple times | LL | use bar::foo; | -------- previous import of the value `foo` here -LL | +LL | LL | fn foo() {} | ^^^^^^^^ `foo` redefined here | diff --git a/src/test/ui/error-codes/E0259.stderr b/src/test/ui/error-codes/E0259.stderr index 4a48a4d5541..06cbc5b4fb5 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 -LL | +LL | LL | extern crate libc as alloc; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `alloc` reimported here | diff --git a/src/test/ui/error-codes/E0260.stderr b/src/test/ui/error-codes/E0260.stderr index 737b20b91ec..2d3305bd15b 100644 --- a/src/test/ui/error-codes/E0260.stderr +++ b/src/test/ui/error-codes/E0260.stderr @@ -3,7 +3,7 @@ error[E0260]: the name `alloc` is defined multiple times | LL | extern crate alloc; | ------------------- previous import of the extern crate `alloc` here -LL | +LL | LL | mod alloc { | ^^^^^^^^^ `alloc` redefined here | diff --git a/src/test/ui/error-codes/E0393.stderr b/src/test/ui/error-codes/E0393.stderr index 7771bacc9ed..8aadf5c8b47 100644 --- a/src/test/ui/error-codes/E0393.stderr +++ b/src/test/ui/error-codes/E0393.stderr @@ -3,7 +3,7 @@ error[E0393]: the type parameter `T` must be explicitly specified | LL | trait A<T=Self> {} | ------------------ type parameter `T` must be specified for this -LL | +LL | LL | fn together_we_will_rule_the_galaxy(son: &dyn A) {} | ^ help: set the type parameter to the desired type: `A<T>` | diff --git a/src/test/ui/error-codes/E0423.stderr b/src/test/ui/error-codes/E0423.stderr index 5f251527e77..8f2ef8c8e6b 100644 --- a/src/test/ui/error-codes/E0423.stderr +++ b/src/test/ui/error-codes/E0423.stderr @@ -31,7 +31,7 @@ error[E0423]: expected function, tuple struct or tuple variant, found struct `Fo | LL | struct Foo { a: bool }; | ---------------------- `Foo` defined here -LL | +LL | LL | let f = Foo(); | ^^^^^ ... diff --git a/src/test/ui/error-codes/E0446.stderr b/src/test/ui/error-codes/E0446.stderr index 73b6ba3c50e..35e79e448d5 100644 --- a/src/test/ui/error-codes/E0446.stderr +++ b/src/test/ui/error-codes/E0446.stderr @@ -3,7 +3,7 @@ error[E0446]: private type `Bar` in public interface | LL | struct Bar(u32); | ---------------- `Bar` declared as private -LL | +LL | LL | pub fn bar() -> Bar { | ^^^^^^^^^^^^^^^^^^^ can't leak private type diff --git a/src/test/ui/error-codes/E0453.stderr b/src/test/ui/error-codes/E0453.stderr index 6d60dc84c21..f982ed26f5c 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) incompatible with previous forbid | LL | #![forbid(non_snake_case)] | -------------- `forbid` level set here -LL | +LL | LL | #[allow(non_snake_case)] | ^^^^^^^^^^^^^^ overruled by previous forbid @@ -12,7 +12,7 @@ error[E0453]: allow(non_snake_case) incompatible with previous forbid | LL | #![forbid(non_snake_case)] | -------------- `forbid` level set here -LL | +LL | LL | #[allow(non_snake_case)] | ^^^^^^^^^^^^^^ overruled by previous forbid diff --git a/src/test/ui/error-codes/E0504.stderr b/src/test/ui/error-codes/E0504.stderr index 04811721aa5..e677e891615 100644 --- a/src/test/ui/error-codes/E0504.stderr +++ b/src/test/ui/error-codes/E0504.stderr @@ -3,7 +3,7 @@ error[E0505]: cannot move out of `fancy_num` because it is borrowed | LL | let fancy_ref = &fancy_num; | ---------- borrow of `fancy_num` occurs here -LL | +LL | LL | let x = move || { | ^^^^^^^ move out of `fancy_num` occurs here LL | println!("child function: {}", fancy_num.num); diff --git a/src/test/ui/error-codes/E0506.stderr b/src/test/ui/error-codes/E0506.stderr index 17f883f84b8..d70406b750a 100644 --- a/src/test/ui/error-codes/E0506.stderr +++ b/src/test/ui/error-codes/E0506.stderr @@ -5,7 +5,7 @@ LL | let fancy_ref = &fancy_num; | ---------- borrow of `fancy_num` occurs here LL | fancy_num = FancyNum { num: 6 }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `fancy_num` occurs here -LL | +LL | LL | println!("Num: {}, Ref: {}", fancy_num.num, fancy_ref.num); | ------------- borrow later used here diff --git a/src/test/ui/feature-gates/feature-gate-with_negative_coherence.stderr b/src/test/ui/feature-gates/feature-gate-with_negative_coherence.stderr index 05007dafa37..d4c201b5d3e 100644 --- a/src/test/ui/feature-gates/feature-gate-with_negative_coherence.stderr +++ b/src/test/ui/feature-gates/feature-gate-with_negative_coherence.stderr @@ -3,7 +3,7 @@ error[E0119]: conflicting implementations of trait `Foo` for type `&_` | LL | impl<T: std::ops::DerefMut> Foo for T { } | ------------------------------------- first implementation here -LL | +LL | LL | impl<T> Foo for &T { } | ^^^^^^^^^^^^^^^^^^ conflicting implementation for `&_` diff --git a/src/test/ui/fmt/format-string-error.stderr b/src/test/ui/fmt/format-string-error.stderr index 8b018480fb0..8a32c225485 100644 --- a/src/test/ui/fmt/format-string-error.stderr +++ b/src/test/ui/fmt/format-string-error.stderr @@ -93,7 +93,7 @@ error: invalid format string: expected `'}'` but string was terminated | LL | { | - because of this opening brace -LL | +LL | LL | "###); | ^ expected `'}'` in format string | diff --git a/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr b/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr index 0724fec9055..d6e7a1d45f0 100644 --- a/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr +++ b/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr @@ -3,10 +3,10 @@ error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as | LL | let (_, thing) = my_stuff.iter().next().unwrap(); | --------------- immutable borrow occurs here -LL | +LL | LL | my_stuff.clear(); | ^^^^^^^^^^^^^^^^ mutable borrow occurs here -LL | +LL | LL | println!("{}", *thing); | ------ immutable borrow later used here diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr b/src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr index fbc58837a8e..b514e9fef4d 100644 --- a/src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr +++ b/src/test/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr @@ -3,7 +3,7 @@ error[E0720]: cannot resolve opaque type | LL | fn id<T>(t: T) -> impl Sized { t } | ---------- returning this opaque type `impl Sized` -LL | +LL | LL | fn recursive_id() -> impl Sized { | ^^^^^^^^^^ recursive opaque type LL | id(recursive_id2()) @@ -25,7 +25,7 @@ error[E0720]: cannot resolve opaque type | LL | fn wrap<T>(t: T) -> impl Sized { (t,) } | ---------- returning this opaque type `impl Sized` -LL | +LL | LL | fn recursive_wrap() -> impl Sized { | ^^^^^^^^^^ recursive opaque type LL | wrap(recursive_wrap2()) diff --git a/src/test/ui/issues/issue-11873.stderr b/src/test/ui/issues/issue-11873.stderr index 4475bdf1474..c814eedd226 100644 --- a/src/test/ui/issues/issue-11873.stderr +++ b/src/test/ui/issues/issue-11873.stderr @@ -7,7 +7,7 @@ LL | let mut f = || v.push(2); | borrow of `v` occurs here LL | let _w = v; | ^ move out of `v` occurs here -LL | +LL | LL | f(); | - borrow later used here diff --git a/src/test/ui/issues/issue-22370.stderr b/src/test/ui/issues/issue-22370.stderr index 950c12ef7a2..4da346f56ab 100644 --- a/src/test/ui/issues/issue-22370.stderr +++ b/src/test/ui/issues/issue-22370.stderr @@ -3,7 +3,7 @@ error[E0393]: the type parameter `T` must be explicitly specified | LL | trait A<T=Self> {} | ------------------ type parameter `T` must be specified for this -LL | +LL | LL | fn f(a: &dyn A) {} | ^ help: set the type parameter to the desired type: `A<T>` | diff --git a/src/test/ui/issues/issue-28472.stderr b/src/test/ui/issues/issue-28472.stderr index 92b598252bf..051ed25b6c9 100644 --- a/src/test/ui/issues/issue-28472.stderr +++ b/src/test/ui/issues/issue-28472.stderr @@ -3,7 +3,7 @@ error[E0428]: the name `foo` is defined multiple times | LL | fn foo(); | --------- previous definition of the value `foo` here -LL | +LL | LL | / pub LL | | fn foo(); | |___________^ `foo` redefined here diff --git a/src/test/ui/issues/issue-3099-a.stderr b/src/test/ui/issues/issue-3099-a.stderr index d6e0a799921..e3733cebba5 100644 --- a/src/test/ui/issues/issue-3099-a.stderr +++ b/src/test/ui/issues/issue-3099-a.stderr @@ -3,7 +3,7 @@ error[E0428]: the name `A` is defined multiple times | LL | enum A { B, C } | ------ previous definition of the type `A` here -LL | +LL | LL | enum A { D, E } | ^^^^^^ `A` redefined here | diff --git a/src/test/ui/issues/issue-3099-b.stderr b/src/test/ui/issues/issue-3099-b.stderr index 3ba8b189da6..c0cfefeb940 100644 --- a/src/test/ui/issues/issue-3099-b.stderr +++ b/src/test/ui/issues/issue-3099-b.stderr @@ -3,7 +3,7 @@ error[E0428]: the name `a` is defined multiple times | LL | pub mod a {} | --------- previous definition of the module `a` here -LL | +LL | LL | pub mod a {} | ^^^^^^^^^ `a` redefined here | diff --git a/src/test/ui/issues/issue-35241.stderr b/src/test/ui/issues/issue-35241.stderr index 4e89f59afbe..319886f8783 100644 --- a/src/test/ui/issues/issue-35241.stderr +++ b/src/test/ui/issues/issue-35241.stderr @@ -3,7 +3,7 @@ error[E0308]: mismatched types | LL | struct Foo(u32); | ---------------- fn(u32) -> Foo {Foo} defined here -LL | +LL | LL | fn test() -> Foo { Foo } | --- ^^^ expected struct `Foo`, found fn item | | diff --git a/src/test/ui/issues/issue-40510-1.stderr b/src/test/ui/issues/issue-40510-1.stderr index 54df40b6e3d..e88f31ea1ee 100644 --- a/src/test/ui/issues/issue-40510-1.stderr +++ b/src/test/ui/issues/issue-40510-1.stderr @@ -3,7 +3,7 @@ error: captured variable cannot escape `FnMut` closure body | LL | let mut x: Box<()> = Box::new(()); | ----- variable defined here -LL | +LL | LL | || { | - inferred to be a `FnMut` closure LL | &mut x diff --git a/src/test/ui/issues/issue-40510-3.stderr b/src/test/ui/issues/issue-40510-3.stderr index cb885ec7d95..22186ba9a67 100644 --- a/src/test/ui/issues/issue-40510-3.stderr +++ b/src/test/ui/issues/issue-40510-3.stderr @@ -3,7 +3,7 @@ error: captured variable cannot escape `FnMut` closure body | LL | let mut x: Vec<()> = Vec::new(); | ----- variable defined here -LL | +LL | LL | || { | - inferred to be a `FnMut` closure LL | / || { diff --git a/src/test/ui/issues/issue-4265.stderr b/src/test/ui/issues/issue-4265.stderr index 4faf5d3a923..acdf963ed3b 100644 --- a/src/test/ui/issues/issue-4265.stderr +++ b/src/test/ui/issues/issue-4265.stderr @@ -5,7 +5,7 @@ LL | / fn bar() { LL | | Foo { baz: 0 }.bar(); LL | | } | |_____- previous definition of `bar` here -LL | +LL | LL | / fn bar() { LL | | } | |_____^ duplicate definition diff --git a/src/test/ui/issues/issue-47646.stderr b/src/test/ui/issues/issue-47646.stderr index 32e8588b3c0..4e28874e140 100644 --- a/src/test/ui/issues/issue-47646.stderr +++ b/src/test/ui/issues/issue-47646.stderr @@ -3,7 +3,7 @@ error[E0502]: cannot borrow `heap` as immutable because it is also borrowed as m | LL | let borrow = heap.peek_mut(); | --------------- mutable borrow occurs here -LL | +LL | LL | match (borrow, ()) { | ------------ a temporary with access to the mutable borrow is created here ... LL | (Some(_), ()) => { diff --git a/src/test/ui/issues/issue-64792-bad-unicode-ctor.stderr b/src/test/ui/issues/issue-64792-bad-unicode-ctor.stderr index c3dda704b0e..2ec151d24d1 100644 --- a/src/test/ui/issues/issue-64792-bad-unicode-ctor.stderr +++ b/src/test/ui/issues/issue-64792-bad-unicode-ctor.stderr @@ -3,7 +3,7 @@ error[E0423]: expected function, tuple struct or tuple variant, found struct `X` | LL | struct X {} | ----------- `X` defined here -LL | +LL | LL | const Y: X = X("รถ"); | ^^^^^^ help: use struct literal syntax instead: `X {}` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr index f764ec43ad1..961f9de6614 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr +++ b/src/test/ui/lifetimes/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 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` -LL | +LL | LL | if true { &self.field } else { x } | ^ lifetime `'a` required diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr index 4c788211576..5bb76381332 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr +++ b/src/test/ui/lifetimes/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 { | -- - let's call the lifetime of this reference `'1` | | | lifetime `'a` defined here -LL | +LL | LL | if x > y { x } else { y } | ^ associated function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr index 11e7fa96d7e..4bcd7cf9578 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr +++ b/src/test/ui/lifetimes/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 { | -- - let's call the lifetime of this reference `'1` | | | lifetime `'a` defined here -LL | +LL | LL | x | ^ associated function was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr index c41f08e691a..34a64f8a63e 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr +++ b/src/test/ui/lifetimes/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 { | -- - let's call the lifetime of this reference `'1` | | | lifetime `'a` defined here -LL | +LL | LL | if true { x } else { self } | ^^^^ associated function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1` diff --git a/src/test/ui/lint/forbid-group-member.stderr b/src/test/ui/lint/forbid-group-member.stderr index 72772a42bed..891fa9885f3 100644 --- a/src/test/ui/lint/forbid-group-member.stderr +++ b/src/test/ui/lint/forbid-group-member.stderr @@ -3,7 +3,7 @@ warning: allow(unused_variables) incompatible with previous forbid | LL | #![forbid(unused)] | ------ `forbid` level set here -LL | +LL | LL | #[allow(unused_variables)] | ^^^^^^^^^^^^^^^^ overruled by previous forbid | @@ -16,7 +16,7 @@ warning: allow(unused_variables) incompatible with previous forbid | LL | #![forbid(unused)] | ------ `forbid` level set here -LL | +LL | LL | #[allow(unused_variables)] | ^^^^^^^^^^^^^^^^ overruled by previous forbid | @@ -28,7 +28,7 @@ warning: allow(unused_variables) incompatible with previous forbid | LL | #![forbid(unused)] | ------ `forbid` level set here -LL | +LL | LL | #[allow(unused_variables)] | ^^^^^^^^^^^^^^^^ overruled by previous forbid | diff --git a/src/test/ui/lint/forbid-member-group.stderr b/src/test/ui/lint/forbid-member-group.stderr index 39700af4d59..e6530177833 100644 --- a/src/test/ui/lint/forbid-member-group.stderr +++ b/src/test/ui/lint/forbid-member-group.stderr @@ -3,7 +3,7 @@ error[E0453]: allow(unused) incompatible with previous forbid | LL | #![forbid(unused_variables)] | ---------------- `forbid` level set here -LL | +LL | LL | #[allow(unused)] | ^^^^^^ overruled by previous forbid @@ -12,7 +12,7 @@ error[E0453]: allow(unused) incompatible with previous forbid | LL | #![forbid(unused_variables)] | ---------------- `forbid` level set here -LL | +LL | LL | #[allow(unused)] | ^^^^^^ overruled by previous forbid diff --git a/src/test/ui/lint/issue-80988.stderr b/src/test/ui/lint/issue-80988.stderr index deee267d0c6..1d397f43133 100644 --- a/src/test/ui/lint/issue-80988.stderr +++ b/src/test/ui/lint/issue-80988.stderr @@ -3,7 +3,7 @@ warning: deny(warnings) incompatible with previous forbid | LL | #![forbid(warnings)] | -------- `forbid` level set here -LL | +LL | LL | #[deny(warnings)] | ^^^^^^^^ overruled by previous forbid | @@ -16,7 +16,7 @@ warning: deny(warnings) incompatible with previous forbid | LL | #![forbid(warnings)] | -------- `forbid` level set here -LL | +LL | LL | #[deny(warnings)] | ^^^^^^^^ overruled by previous forbid | @@ -28,7 +28,7 @@ warning: deny(warnings) incompatible with previous forbid | LL | #![forbid(warnings)] | -------- `forbid` level set here -LL | +LL | LL | #[deny(warnings)] | ^^^^^^^^ overruled by previous forbid | diff --git a/src/test/ui/lint/lint-forbid-attr.stderr b/src/test/ui/lint/lint-forbid-attr.stderr index 48228c5dfdd..5977b9c949d 100644 --- a/src/test/ui/lint/lint-forbid-attr.stderr +++ b/src/test/ui/lint/lint-forbid-attr.stderr @@ -3,7 +3,7 @@ error[E0453]: allow(deprecated) incompatible with previous forbid | LL | #![forbid(deprecated)] | ---------- `forbid` level set here -LL | +LL | LL | #[allow(deprecated)] | ^^^^^^^^^^ overruled by previous forbid @@ -12,7 +12,7 @@ error[E0453]: allow(deprecated) incompatible with previous forbid | LL | #![forbid(deprecated)] | ---------- `forbid` level set here -LL | +LL | LL | #[allow(deprecated)] | ^^^^^^^^^^ overruled by previous forbid diff --git a/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr b/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr index 5308bba440e..afbab989676 100644 --- a/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr +++ b/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr @@ -3,7 +3,7 @@ error: conflicting implementations of trait `Foo` for type `(dyn std::marker::Se | LL | impl Foo for dyn Send {} | --------------------- first implementation here -LL | +LL | LL | impl Foo for dyn Send + Send {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + 'static)` | @@ -16,7 +16,7 @@ error: conflicting implementations of trait `Foo` for type `(dyn std::marker::Se | LL | impl Foo for dyn Send + Sync {} | ---------------------------- first implementation here -LL | +LL | LL | impl Foo for dyn Sync + Send {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + std::marker::Sync + 'static)` | diff --git a/src/test/ui/lint/must_not_suspend/ref.stderr b/src/test/ui/lint/must_not_suspend/ref.stderr index 6d30f134ec4..5f000014c7d 100644 --- a/src/test/ui/lint/must_not_suspend/ref.stderr +++ b/src/test/ui/lint/must_not_suspend/ref.stderr @@ -3,7 +3,7 @@ error: `Umm` held across a suspend point, but should not be | LL | let guard = &mut self.u; | ^^^^^^ -LL | +LL | LL | other().await; | ------ the value is held across this suspend point | diff --git a/src/test/ui/lint/must_not_suspend/trait.stderr b/src/test/ui/lint/must_not_suspend/trait.stderr index dd3978b02a8..60369430a3e 100644 --- a/src/test/ui/lint/must_not_suspend/trait.stderr +++ b/src/test/ui/lint/must_not_suspend/trait.stderr @@ -23,7 +23,7 @@ error: boxed `Wow` trait object held across a suspend point, but should not be | LL | let _guard2 = r#dyn(); | ^^^^^^^ -LL | +LL | LL | other().await; | ------ the value is held across this suspend point | diff --git a/src/test/ui/liveness/liveness-use-after-move.stderr b/src/test/ui/liveness/liveness-use-after-move.stderr index df54af9f0f2..f7d131109ea 100644 --- a/src/test/ui/liveness/liveness-use-after-move.stderr +++ b/src/test/ui/liveness/liveness-use-after-move.stderr @@ -5,7 +5,7 @@ LL | let x: Box<_> = 5.into(); | - move occurs because `x` has type `Box<i32>`, which does not implement the `Copy` trait LL | let y = x; | - value moved here -LL | +LL | LL | println!("{}", *x); | ^^ value borrowed here after move | diff --git a/src/test/ui/match/match-tag-nullary.stderr b/src/test/ui/match/match-tag-nullary.stderr index 723c7fa92b1..a6add31d1c5 100644 --- a/src/test/ui/match/match-tag-nullary.stderr +++ b/src/test/ui/match/match-tag-nullary.stderr @@ -3,7 +3,7 @@ error[E0308]: mismatched types | LL | enum B { B } | - unit variant defined here -LL | +LL | LL | fn main() { let x: A = A::A; match x { B::B => { } } } | - ^^^^ expected enum `A`, found enum `B` | | diff --git a/src/test/ui/missing/missing-items/missing-type-parameter2.stderr b/src/test/ui/missing/missing-items/missing-type-parameter2.stderr index cbceec58eb1..f33951c98bf 100644 --- a/src/test/ui/missing/missing-items/missing-type-parameter2.stderr +++ b/src/test/ui/missing/missing-items/missing-type-parameter2.stderr @@ -3,7 +3,7 @@ error[E0412]: cannot find type `N` in this scope | LL | struct X<const N: u8>(); | ------------------------ similarly named struct `X` defined here -LL | +LL | LL | impl X<N> {} | ^ | diff --git a/src/test/ui/nll/capture-ref-in-struct.stderr b/src/test/ui/nll/capture-ref-in-struct.stderr index 521e543bd26..cdfe7f6db82 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 | } | - `y` dropped here while still borrowed -LL | +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 22398f08572..49ec0dd931a 100644 --- a/src/test/ui/nll/closure-requirements/escape-argument.stderr +++ b/src/test/ui/nll/closure-requirements/escape-argument.stderr @@ -32,7 +32,7 @@ LL | closure(&mut p, &y); LL | LL | } | - `y` dropped here while still borrowed -LL | +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 e1b446fc61f..f0ae4c7fb04 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr +++ b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr @@ -54,7 +54,7 @@ LL | let mut closure1 = || p = &y; ... LL | } | - `y` dropped here while still borrowed -LL | +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 0ea1076c32e..e99fc4b43a2 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr +++ b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr @@ -36,7 +36,7 @@ LL | let mut closure = || p = &y; ... LL | } | - `y` dropped here while still borrowed -LL | +LL | LL | deref(p); | - borrow later used here diff --git a/src/test/ui/nll/issue-52534-2.stderr b/src/test/ui/nll/issue-52534-2.stderr index cef4aba0240..ac385e056b9 100644 --- a/src/test/ui/nll/issue-52534-2.stderr +++ b/src/test/ui/nll/issue-52534-2.stderr @@ -6,7 +6,7 @@ LL | y = &x LL | LL | } | - `x` dropped here while still borrowed -LL | +LL | LL | println!("{}", y); | - borrow later used here diff --git a/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr b/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr index 6dacfd1f264..d8f43cbc92a 100644 --- a/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr +++ b/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr @@ -9,7 +9,7 @@ LL | D("other").next(&_thing1) ... LL | } | - `_thing1` dropped here while still borrowed -LL | +LL | LL | ; | - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D` | diff --git a/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr b/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr index 68d3cef8aa1..92f5ffdf388 100644 --- a/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr +++ b/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr @@ -8,7 +8,7 @@ LL | D(&_thing1).end() | a temporary with access to the borrow is created here ... LL | } | - `_thing1` dropped here while still borrowed -LL | +LL | LL | ; | - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D` | diff --git a/src/test/ui/no-capture-arc.stderr b/src/test/ui/no-capture-arc.stderr index 37032e73f19..7fa2090e3e6 100644 --- a/src/test/ui/no-capture-arc.stderr +++ b/src/test/ui/no-capture-arc.stderr @@ -3,7 +3,7 @@ error[E0382]: borrow of moved value: `arc_v` | LL | let arc_v = Arc::new(v); | ----- move occurs because `arc_v` has type `Arc<Vec<i32>>`, which does not implement the `Copy` trait -LL | +LL | LL | thread::spawn(move|| { | ------ value moved into closure here LL | assert_eq!((*arc_v)[3], 4); diff --git a/src/test/ui/no-reuse-move-arc.stderr b/src/test/ui/no-reuse-move-arc.stderr index 6f37d4c9d86..bcc4506dc8d 100644 --- a/src/test/ui/no-reuse-move-arc.stderr +++ b/src/test/ui/no-reuse-move-arc.stderr @@ -3,7 +3,7 @@ error[E0382]: borrow of moved value: `arc_v` | LL | let arc_v = Arc::new(v); | ----- move occurs because `arc_v` has type `Arc<Vec<i32>>`, which does not implement the `Copy` trait -LL | +LL | LL | thread::spawn(move|| { | ------ value moved into closure here LL | assert_eq!((*arc_v)[3], 4); diff --git a/src/test/ui/not-clone-closure.stderr b/src/test/ui/not-clone-closure.stderr index 92909797c96..78b35569c21 100644 --- a/src/test/ui/not-clone-closure.stderr +++ b/src/test/ui/not-clone-closure.stderr @@ -6,7 +6,7 @@ LL | let hello = move || { LL | | println!("Hello {}", a.0); LL | | }; | |_____- within this `[closure@$DIR/not-clone-closure.rs:7:17: 9:6]` -LL | +LL | LL | let hello = hello.clone(); | ^^^^^ within `[closure@$DIR/not-clone-closure.rs:7:17: 9:6]`, the trait `Clone` is not implemented for `S` | diff --git a/src/test/ui/parser/inner-attr-after-doc-comment.stderr b/src/test/ui/parser/inner-attr-after-doc-comment.stderr index 950992348a1..2cfafac7794 100644 --- a/src/test/ui/parser/inner-attr-after-doc-comment.stderr +++ b/src/test/ui/parser/inner-attr-after-doc-comment.stderr @@ -5,7 +5,7 @@ LL | / /** LL | | * My module LL | | */ | |___- previous doc comment -LL | +LL | LL | #![recursion_limit="100"] | ^^^^^^^^^^^^^^^^^^^^^^^^^ not permitted following an outer attribute LL | diff --git a/src/test/ui/parser/inner-attr.stderr b/src/test/ui/parser/inner-attr.stderr index cba89b2a95f..331c254a52b 100644 --- a/src/test/ui/parser/inner-attr.stderr +++ b/src/test/ui/parser/inner-attr.stderr @@ -3,7 +3,7 @@ error: an inner attribute is not permitted following an outer attribute | LL | #[feature(lang_items)] | ---------------------- previous outer attribute -LL | +LL | LL | #![recursion_limit="100"] | ^^^^^^^^^^^^^^^^^^^^^^^^^ not permitted following an outer attribute LL | fn main() {} diff --git a/src/test/ui/parser/issues/issue-62894.stderr b/src/test/ui/parser/issues/issue-62894.stderr index ed5e863bd9d..ae89926914e 100644 --- a/src/test/ui/parser/issues/issue-62894.stderr +++ b/src/test/ui/parser/issues/issue-62894.stderr @@ -6,7 +6,7 @@ LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq! | | | | | unclosed delimiter | unclosed delimiter -LL | +LL | LL | fn main() {} | ^ @@ -18,7 +18,7 @@ LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq! | | | | | unclosed delimiter | unclosed delimiter -LL | +LL | LL | fn main() {} | ^ @@ -30,7 +30,7 @@ LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq! | | | | | unclosed delimiter | unclosed delimiter -LL | +LL | LL | fn main() {} | ^ @@ -39,7 +39,7 @@ error: expected one of `(`, `[`, or `{`, found keyword `fn` | LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq! | - expected one of `(`, `[`, or `{` -LL | +LL | LL | fn main() {} | ^^ unexpected token | diff --git a/src/test/ui/parser/issues/issue-62973.stderr b/src/test/ui/parser/issues/issue-62973.stderr index 871b5d59651..bc3358fc6ba 100644 --- a/src/test/ui/parser/issues/issue-62973.stderr +++ b/src/test/ui/parser/issues/issue-62973.stderr @@ -5,8 +5,8 @@ LL | fn p() { match s { v, E { [) {) } | - - unclosed delimiter | | | unclosed delimiter -LL | -LL | +LL | +LL | | ^ error: this file contains an unclosed delimiter @@ -16,8 +16,8 @@ LL | fn p() { match s { v, E { [) {) } | - - unclosed delimiter | | | unclosed delimiter -LL | -LL | +LL | +LL | | ^ error: expected one of `,` or `}`, found `{` @@ -51,8 +51,8 @@ error: expected one of `.`, `?`, `{`, or an operator, found `}` | LL | fn p() { match s { v, E { [) {) } | ----- while parsing this `match` expression -LL | -LL | +LL | +LL | | ^ expected one of `.`, `?`, `{`, or an operator error: mismatched closing delimiter: `)` diff --git a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr b/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr index c871e549c9e..165eb8ae932 100644 --- a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr +++ b/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr @@ -3,7 +3,7 @@ error: unexpected closing delimiter: `}` | LL | fn main() { | - this opening brace... -LL | +LL | LL | } | - ...matches this closing brace LL | let _ = (); diff --git a/src/test/ui/reachable/unreachable-code.stderr b/src/test/ui/reachable/unreachable-code.stderr index 4b951263dbd..cb1b760c282 100644 --- a/src/test/ui/reachable/unreachable-code.stderr +++ b/src/test/ui/reachable/unreachable-code.stderr @@ -3,7 +3,7 @@ error: unreachable statement | LL | loop{} | ------ any code following this expression is unreachable -LL | +LL | LL | let a = 3; | ^^^^^^^^^^ unreachable statement | diff --git a/src/test/ui/resolve/issue-23716.stderr b/src/test/ui/resolve/issue-23716.stderr index e7bebfbbcb5..8b89c350c84 100644 --- a/src/test/ui/resolve/issue-23716.stderr +++ b/src/test/ui/resolve/issue-23716.stderr @@ -3,7 +3,7 @@ error[E0530]: function parameters cannot shadow statics | LL | static foo: i32 = 0; | -------------------- the static `foo` is defined here -LL | +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; | -------------------- the static `answer` is imported here -LL | +LL | LL | fn question(answer: i32) {} | ^^^^^^ cannot be named the same as a static diff --git a/src/test/ui/resolve/issue-81508.stderr b/src/test/ui/resolve/issue-81508.stderr index 15555631b90..7258174ba89 100644 --- a/src/test/ui/resolve/issue-81508.stderr +++ b/src/test/ui/resolve/issue-81508.stderr @@ -3,7 +3,7 @@ error[E0433]: failed to resolve: use of undeclared type `Baz` | LL | let Baz: &str = ""; | --- help: `Baz` is defined here, but is not a type -LL | +LL | LL | println!("{}", Baz::Bar); | ^^^ use of undeclared type `Baz` diff --git a/src/test/ui/resolve/levenshtein.stderr b/src/test/ui/resolve/levenshtein.stderr index a7f10f7719e..249a7e53d45 100644 --- a/src/test/ui/resolve/levenshtein.stderr +++ b/src/test/ui/resolve/levenshtein.stderr @@ -9,7 +9,7 @@ error[E0412]: cannot find type `Baz` in this scope | LL | enum Bar { } | -------- similarly named enum `Bar` defined here -LL | +LL | LL | type A = Baz; // Misspelled type name. | ^^^ help: an enum with a similar name exists: `Bar` diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr b/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr index 922753a00db..5e5c9f6b3d8 100644 --- a/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr +++ b/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr @@ -3,7 +3,7 @@ error[E0255]: the name `transmute` is defined multiple times | LL | use std::mem::transmute; | ------------------- previous import of the value `transmute` here -LL | +LL | LL | fn transmute() {} | ^^^^^^^^^^^^^^ `transmute` redefined here | diff --git a/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr b/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr index b63495458a0..198ef10311e 100644 --- a/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr +++ b/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr @@ -3,7 +3,7 @@ error[E0255]: the name `Iter` is defined multiple times | LL | use std::slice::Iter; | ---------------- previous import of the type `Iter` here -LL | +LL | LL | struct Iter; | ^^^^^^^^^^^^ `Iter` redefined here | diff --git a/src/test/ui/specialization/issue-52050.stderr b/src/test/ui/specialization/issue-52050.stderr index ab3cf27d0d0..8732b10d8f8 100644 --- a/src/test/ui/specialization/issue-52050.stderr +++ b/src/test/ui/specialization/issue-52050.stderr @@ -17,7 +17,7 @@ LL | | I: Iterator, LL | | { LL | | } | |_- first implementation here -LL | +LL | LL | impl IntoPyDictPointer for () | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `()` | diff --git a/src/test/ui/suggestions/suggest-trait-items.stderr b/src/test/ui/suggestions/suggest-trait-items.stderr index 151bae7d1b9..4abc3446610 100644 --- a/src/test/ui/suggestions/suggest-trait-items.stderr +++ b/src/test/ui/suggestions/suggest-trait-items.stderr @@ -48,7 +48,7 @@ error[E0046]: not all trait items implemented, missing: `Type`, `foo`, `bar`, `q | LL | type Type; | ---------- `Type` from trait -LL | +LL | LL | fn foo(); | --------- `foo` from trait LL | fn bar(); diff --git a/src/test/ui/traits/alias/no-duplicates.stderr b/src/test/ui/traits/alias/no-duplicates.stderr index d3002db46a2..bf244b97e9b 100644 --- a/src/test/ui/traits/alias/no-duplicates.stderr +++ b/src/test/ui/traits/alias/no-duplicates.stderr @@ -262,7 +262,7 @@ LL | trait _5 = Obj + Send; | | | additional non-auto trait | first non-auto trait -LL | +LL | LL | type _T20 = dyn _5 + _5; | -- ^^ trait alias used in trait object type (additional use) | | @@ -326,7 +326,7 @@ LL | trait _6 = _5 + _5; // ==> Obj + Send + Obj + Send | -- -- referenced here (additional use) | | | referenced here (first use) -LL | +LL | LL | type _T30 = dyn _6; | ^^ | | @@ -392,7 +392,7 @@ LL | trait _7 = _5 + Sync; | -- referenced here (first use) LL | trait _8 = Unpin + _7; | -- referenced here (first use) -LL | +LL | LL | type _T40 = dyn _8 + Obj; | -- ^^^ additional non-auto trait | | diff --git a/src/test/ui/traits/alias/no-extra-traits.stderr b/src/test/ui/traits/alias/no-extra-traits.stderr index eaba70d7ce3..4b1ddf6843c 100644 --- a/src/test/ui/traits/alias/no-extra-traits.stderr +++ b/src/test/ui/traits/alias/no-extra-traits.stderr @@ -148,7 +148,7 @@ LL | trait _1 = _0; ... LL | trait _5 = Sync + ObjB + Send; | ---- first non-auto trait -LL | +LL | LL | type _T20 = dyn _5 + _1; | -- ^^ trait alias used in trait object type (additional use) | | @@ -460,7 +460,7 @@ LL | trait _9 = _5 + Sync; | -- referenced here (first use) LL | trait _10 = Unpin + _9; | -- referenced here (first use) -LL | +LL | LL | type _T40 = dyn _10 + ObjA; | --- ^^^^ additional non-auto trait | | diff --git a/src/test/ui/traits/alias/only-maybe-bound.stderr b/src/test/ui/traits/alias/only-maybe-bound.stderr index e9e846c2ff3..06c707e4332 100644 --- a/src/test/ui/traits/alias/only-maybe-bound.stderr +++ b/src/test/ui/traits/alias/only-maybe-bound.stderr @@ -12,7 +12,7 @@ error[E0224]: at least one trait is required for an object type | LL | trait _2 = _1 + _1; | ------------------- this alias does not contain a trait -LL | +LL | LL | type _T1 = dyn _2; | ^^^^^^ diff --git a/src/test/ui/traits/vtable/issue-97381.stderr b/src/test/ui/traits/vtable/issue-97381.stderr index f88c8716ff7..c4f8294e263 100644 --- a/src/test/ui/traits/vtable/issue-97381.stderr +++ b/src/test/ui/traits/vtable/issue-97381.stderr @@ -3,7 +3,7 @@ error[E0505]: cannot move out of `v` because it is borrowed | LL | let el = &v[0]; | - borrow of `v` occurs here -LL | +LL | LL | for _ in v { | ^ move out of `v` occurs here LL | diff --git a/src/test/ui/try-block/try-block-bad-lifetime.stderr b/src/test/ui/try-block/try-block-bad-lifetime.stderr index de1667d8832..ea079e30d9c 100644 --- a/src/test/ui/try-block/try-block-bad-lifetime.stderr +++ b/src/test/ui/try-block/try-block-bad-lifetime.stderr @@ -42,7 +42,7 @@ LL | let k = &mut i; ... LL | i = 40; | ^^^^^^ assignment to borrowed `i` occurs here -LL | +LL | LL | let i_ptr = if let Err(i_ptr) = j { i_ptr } else { panic ! ("") }; | - borrow later used here diff --git a/src/test/ui/try-block/try-block-unreachable-code-lint.stderr b/src/test/ui/try-block/try-block-unreachable-code-lint.stderr index 61df702fb87..9fc0b661f1e 100644 --- a/src/test/ui/try-block/try-block-unreachable-code-lint.stderr +++ b/src/test/ui/try-block/try-block-unreachable-code-lint.stderr @@ -3,7 +3,7 @@ warning: unreachable expression | LL | return; | ------ any code following this expression is unreachable -LL | +LL | LL | / try { LL | | loop { LL | | err()?; @@ -32,7 +32,7 @@ LL | / loop { LL | | err()?; LL | | } | |_________- any code following this expression is unreachable -LL | +LL | LL | 42 | ^^ unreachable expression diff --git a/src/test/ui/type-alias-impl-trait/issue-63279.stderr b/src/test/ui/type-alias-impl-trait/issue-63279.stderr index bcc9c57f91c..33f81a77aaf 100644 --- a/src/test/ui/type-alias-impl-trait/issue-63279.stderr +++ b/src/test/ui/type-alias-impl-trait/issue-63279.stderr @@ -21,7 +21,7 @@ error[E0308]: mismatched types | LL | type Closure = impl FnOnce(); | ------------- the expected opaque type -LL | +LL | LL | fn c() -> Closure { | ------- expected `Closure` because of return type LL | || -> Closure { || () } diff --git a/src/test/ui/type-alias-impl-trait/issue-74280.stderr b/src/test/ui/type-alias-impl-trait/issue-74280.stderr index 7a22b360a31..573e691b4cc 100644 --- a/src/test/ui/type-alias-impl-trait/issue-74280.stderr +++ b/src/test/ui/type-alias-impl-trait/issue-74280.stderr @@ -3,7 +3,7 @@ error[E0308]: mismatched types | LL | type Test = impl Copy; | --------- the expected opaque type -LL | +LL | LL | fn test() -> Test { | ---- expected `Test` because of return type LL | let y = || -> Test { () }; diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr b/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr index 4fc21bd7af2..ea259cf3d37 100644 --- a/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr +++ b/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr @@ -5,7 +5,7 @@ LL | / trait Foo<T=Self> { LL | | fn method(&self); LL | | } | |_- type parameter `T` must be specified for this -LL | +LL | LL | fn foo(x: &dyn Foo) { } | ^^^ help: set the type parameter to the desired type: `Foo<T>` | diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr index 94de194705d..cbdb4dd0fb5 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr @@ -31,7 +31,7 @@ error[E0597]: `factorial` does not live long enough | LL | let mut factorial: Option<Box<dyn Fn(u32) -> u32 + 'static>> = None; | ----------------------------------------- type annotation requires that `factorial` is borrowed for `'static` -LL | +LL | LL | let f = |x: u32| -> u32 { | --------------- value captured here LL | let g = factorial.as_ref().unwrap(); @@ -45,7 +45,7 @@ error[E0506]: cannot assign to `factorial` because it is borrowed | LL | let mut factorial: Option<Box<dyn Fn(u32) -> u32 + 'static>> = None; | ----------------------------------------- type annotation requires that `factorial` is borrowed for `'static` -LL | +LL | LL | let f = |x: u32| -> u32 { | --------------- borrow of `factorial` occurs here LL | let g = factorial.as_ref().unwrap(); diff --git a/src/test/ui/unop-move-semantics.stderr b/src/test/ui/unop-move-semantics.stderr index 199d5e37278..14052486cbb 100644 --- a/src/test/ui/unop-move-semantics.stderr +++ b/src/test/ui/unop-move-semantics.stderr @@ -5,7 +5,7 @@ LL | fn move_then_borrow<T: Not<Output=T> + Clone>(x: T) { | - move occurs because `x` has type `T`, which does not implement the `Copy` trait LL | !x; | -- `x` moved due to usage in operator -LL | +LL | LL | x.clone(); | ^^^^^^^^^ value borrowed here after move | diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr b/src/test/ui/use/use-after-move-implicity-coerced-object.stderr index 0ad6d6c7c0e..26804216d9d 100644 --- a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr +++ b/src/test/ui/use/use-after-move-implicity-coerced-object.stderr @@ -6,7 +6,7 @@ LL | let n: Box<_> = Number { n: 42 }.into(); LL | let mut l: Box<_> = List { list: Vec::new() }.into(); LL | l.push(n); | - value moved here -LL | +LL | LL | let x = n.to_string(); | ^^^^^^^^^^^^^ value borrowed here after move |