fix one more case of trailing space

Author: klensy

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(

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`
    |                  |

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>`
    |

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
 

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
    |

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
 

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
 

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
 

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
 

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
 

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
 

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();

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
    |            |

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
 ...

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]);

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
 

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
    |                        |

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
 ...

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`
 ...

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);
    |     ^^------^^^^^^^^
    |     | |

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
 

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 |

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);

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
 

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
 

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`
    |

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)`
    |

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`
    |

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<_>`
 

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`
 

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`
    |

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
 ...

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
    |

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
    |