Rollup merge of #126723 - estebank:dot-dot-dot, r=Nadrieril

GuillaumeGomez · web-flow · commit 399c5cabdd99 · 2024-06-22T12:57:19.000+02:00
Fix `...` in multline code-skips in suggestions

When we have long code skips, we write `...` in the line number gutter.

For suggestions, we were "centering" the `...` with the line, but that was inconsistent with what we do in every other case *and* off-center.
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs
@@ -1905,7 +1905,7 @@ impl HumanEmitter {
                     //
                     // LL | this line was highlighted
                     // LL | this line is just for context
-                    //   ...
+                    // ...
                     // LL | this line is just for context
                     // LL | this line was highlighted
                     _ => {
@@ -1926,7 +1926,7 @@ impl HumanEmitter {
                             )
                         }
 
-                        buffer.puts(row_num, max_line_num_len - 1, "...", Style::LineNumber);
+                        buffer.puts(row_num, 0, "...", Style::LineNumber);
                         row_num += 1;
 
                         if let Some((p, l)) = last_line {
diff --git a/src/tools/clippy/tests/ui/bind_instead_of_map_multipart.stderr b/src/tools/clippy/tests/ui/bind_instead_of_map_multipart.stderr
@@ -62,7 +62,7 @@ LL |         }
 LL |         match s.len() {
 LL ~             10 => 2,
 LL |             20 => {
- ...
+...
 LL |                         if foo() {
 LL ~                             return 20;
 LL |                         }
diff --git a/src/tools/clippy/tests/ui/needless_collect_indirect.stderr b/src/tools/clippy/tests/ui/needless_collect_indirect.stderr
@@ -212,7 +212,7 @@ help: check if the original Iterator contains an element instead of collecting t
    |
 LL ~             
 LL |
- ...
+...
 LL |                 // Do lint
 LL ~                 vec.iter().map(|k| k * k).any(|x| x == n);
    |
diff --git a/src/tools/clippy/tests/ui/needless_late_init.stderr b/src/tools/clippy/tests/ui/needless_late_init.stderr
@@ -215,7 +215,7 @@ help: move the declaration `x` here
    |
 LL ~     
 LL |     // types that should be considered insignificant
- ...
+...
 LL |     let y = Box::new(4);
 LL ~     let x = SignificantDrop;
    |
diff --git a/src/tools/clippy/tests/ui/needless_return.stderr b/src/tools/clippy/tests/ui/needless_return.stderr
@@ -518,7 +518,7 @@ help: remove `return`
    |
 LL ~             10
 LL |         },
- ...
+...
 LL |         },
 LL ~     }
    |
diff --git a/tests/ui/closures/2229_closure_analysis/migrations/auto_traits.stderr b/tests/ui/closures/2229_closure_analysis/migrations/auto_traits.stderr
@@ -17,7 +17,7 @@ help: add a dummy let to cause `fptr` to be fully captured
    |
 LL ~     thread::spawn(move || { let _ = &fptr; unsafe {
 LL |
- ...
+...
 LL |
 LL ~     } }).join().unwrap();
    |
@@ -39,7 +39,7 @@ help: add a dummy let to cause `fptr` to be fully captured
    |
 LL ~     thread::spawn(move || { let _ = &fptr; unsafe {
 LL |
- ...
+...
 LL |
 LL ~     } }).join().unwrap();
    |
diff --git a/tests/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.stderr b/tests/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.stderr
@@ -109,7 +109,7 @@ help: add a dummy let to cause `fptr1`, `fptr2` to be fully captured
    |
 LL ~     thread::spawn(move || { let _ = (&fptr1, &fptr2); unsafe {
 LL |
- ...
+...
 LL |
 LL ~     } }).join().unwrap();
    |
diff --git a/tests/ui/imports/issue-59764.stderr b/tests/ui/imports/issue-59764.stderr
@@ -209,7 +209,7 @@ help: a macro with this name exists at the root of the crate
    |
 LL ~         issue_59764::{makro as foobar, 
 LL |
- ...
+...
 LL |
 LL ~             foo::{baz}
    |
diff --git a/tests/ui/issues/issue-22644.stderr b/tests/ui/issues/issue-22644.stderr
@@ -64,7 +64,7 @@ help: try comparing the cast value
    |
 LL ~     println!("{}", (a
 LL |
- ...
+...
 LL |
 LL ~                    usize)
    |
diff --git a/tests/ui/issues/issue-57271.stderr b/tests/ui/issues/issue-57271.stderr
@@ -17,7 +17,7 @@ help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
    |
 LL ~     Array(Box<TypeSignature>),
 LL |     TypeVariable(()),
- ...
+...
 LL |     Base(BaseType),
 LL ~     Object(Box<ObjectType>),
    |
diff --git a/tests/ui/let-else/let-else-if.stderr b/tests/ui/let-else/let-else-if.stderr
@@ -8,7 +8,7 @@ help: try placing this code inside a block
    |
 LL ~     let Some(_) = Some(()) else { if true {
 LL |
- ...
+...
 LL |         return;
 LL ~     } };
    |
diff --git a/tests/ui/loops/loop-else-break-with-value.stderr b/tests/ui/loops/loop-else-break-with-value.stderr
@@ -27,7 +27,7 @@ help: you might want to use `if let` to ignore the variant that isn't matched
    |
 LL ~     if let Some(1) = loop {
 LL |
- ...
+...
 LL |         return;
 LL ~     } { todo!() };
    |
diff --git a/tests/ui/moves/nested-loop-moved-value-wrong-continue.stderr b/tests/ui/moves/nested-loop-moved-value-wrong-continue.stderr
@@ -26,7 +26,7 @@ help: consider moving the expression out of the loop so it is only moved once
 LL ~     for foo in foos { let mut value = baz.push(foo);
 LL ~     for bar in &bars { if foo == *bar {
 LL |
- ...
+...
 LL |
 LL ~         value;
    |
@@ -69,7 +69,7 @@ help: consider moving the expression out of the loop so it is only moved once
 LL ~         let mut value = baz.push(foo);
 LL ~         for bar in &bars {
 LL |
- ...
+...
 LL |             if foo == *bar {
 LL ~                 value;
    |
diff --git a/tests/ui/parser/recover/recover-labeled-non-block-expr.stderr b/tests/ui/parser/recover/recover-labeled-non-block-expr.stderr
@@ -54,7 +54,7 @@ help: consider enclosing expression in a block
    |
 LL ~     let _i = 'label: { match x {
 LL |         0 => 42,
- ...
+...
 LL |         _ => 1,
 LL ~     } };
    |
diff --git a/tests/ui/span/recursive-type-field.stderr b/tests/ui/span/recursive-type-field.stderr
@@ -17,7 +17,7 @@ help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
    |
 LL ~     bar: Box<Bar<'a>>,
 LL |     b: Rc<Bar<'a>>,
- ...
+...
 LL | struct Bar<'a> {
 LL ~     y: (Box<Foo<'a>>, Box<Foo<'a>>),
    |
diff --git a/tests/ui/suggestions/issue-68049-2.stderr b/tests/ui/suggestions/issue-68049-2.stderr
@@ -19,7 +19,7 @@ help: consider changing this to be a mutable reference in the `impl` method and
    |
 LL ~   fn example(&mut self, input: &i32);
 LL | }
- ...
+...
 LL | impl Hello for Test2 {
 LL ~   fn example(&mut self, input: &i32) {
    |
diff --git a/tests/ui/try-trait/try-operator-on-main.stderr b/tests/ui/try-trait/try-operator-on-main.stderr
@@ -12,7 +12,7 @@ help: consider adding return type
    |
 LL ~ fn main() -> Result<(), Box<dyn std::error::Error>> {
 LL |     // error for a `Try` type on a non-`Try` fn
- ...
+...
 LL |     try_trait_generic::<()>();
 LL + 
 LL +     Ok(())
diff --git a/tests/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr b/tests/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr
@@ -14,7 +14,7 @@ help: consider introducing a named lifetime parameter
    |
 LL ~ fn main<'a>() {
 LL |     eq::< dyn for<'a> Foo<(&'a isize,), Output=&'a isize>,
- ...
+...
 LL |
 LL ~     let _: dyn Foo(&'a isize, &'a usize) -> &'a usize;
    |

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ help: check if the original Iterator contains an element instead of collecting t`
`212`	`212`	`\|`
`213`	`213`	`LL ~`
`214`	`214`	`LL \|`
`215`		`- ...`
	`215`	`+...`
`216`	`216`	`LL \| // Do lint`
`217`	`217`	`LL ~ vec.iter().map(\|k\| k * k).any(\|x\| x == n);`
`218`	`218`	`\|`
Original file line number	Diff line number	Diff line change
@@ -215,7 +215,7 @@ help: move the declaration `x` here
`215`	`215`	`\|`
`216`	`216`	`LL ~`
`217`	`217`	`LL \| // types that should be considered insignificant`
`218`		`- ...`
	`218`	`+...`
`219`	`219`	`LL \| let y = Box::new(4);`
`220`	`220`	`LL ~ let x = SignificantDrop;`
`221`	`221`	`\|`
Original file line number	Diff line number	Diff line change
@@ -518,7 +518,7 @@ help: remove `return`
`518`	`518`	`\|`
`519`	`519`	`LL ~ 10`
`520`	`520`	`LL \| },`
`521`		`- ...`
	`521`	`+...`
`522`	`522`	`LL \| },`
`523`	`523`	`LL ~ }`
`524`	`524`	`\|`
Original file line number	Diff line number	Diff line change
@@ -17,7 +17,7 @@ help: add a dummy let to cause `fptr` to be fully captured
`17`	`17`	`\|`
`18`	`18`	`LL ~ thread::spawn(move \|\| { let _ = &fptr; unsafe {`
`19`	`19`	`LL \|`
`20`		`- ...`
	`20`	`+...`
`21`	`21`	`LL \|`
`22`	`22`	`LL ~ } }).join().unwrap();`
`23`	`23`	`\|`
@@ -39,7 +39,7 @@ help: add a dummy let to cause `fptr` to be fully captured
`39`	`39`	`\|`
`40`	`40`	`LL ~ thread::spawn(move \|\| { let _ = &fptr; unsafe {`
`41`	`41`	`LL \|`
`42`		`- ...`
	`42`	`+...`
`43`	`43`	`LL \|`
`44`	`44`	`LL ~ } }).join().unwrap();`
`45`	`45`	`\|`
Original file line number	Diff line number	Diff line change
@@ -109,7 +109,7 @@ help: add a dummy let to cause `fptr1`, `fptr2` to be fully captured
`109`	`109`	`\|`
`110`	`110`	`LL ~ thread::spawn(move \|\| { let _ = (&fptr1, &fptr2); unsafe {`
`111`	`111`	`LL \|`
`112`		`- ...`
	`112`	`+...`
`113`	`113`	`LL \|`
`114`	`114`	`LL ~ } }).join().unwrap();`
`115`	`115`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ help: a macro with this name exists at the root of the crate`
`209`	`209`	`\|`
`210`	`210`	`LL ~ issue_59764::{makro as foobar,`
`211`	`211`	`LL \|`
`212`		`- ...`
	`212`	`+...`
`213`	`213`	`LL \|`
`214`	`214`	`LL ~ foo::{baz}`
`215`	`215`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ help: try comparing the cast value`
`64`	`64`	`\|`
`65`	`65`	`LL ~ println!("{}", (a`
`66`	`66`	`LL \|`
`67`		`- ...`
	`67`	`+...`
`68`	`68`	`LL \|`
`69`	`69`	`LL ~ usize)`
`70`	`70`	`\|`
Original file line number	Diff line number	Diff line change
@@ -17,7 +17,7 @@ help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
`17`	`17`	`\|`
`18`	`18`	`LL ~ Array(Box<TypeSignature>),`
`19`	`19`	`LL \| TypeVariable(()),`
`20`		`- ...`
	`20`	`+...`
`21`	`21`	`LL \| Base(BaseType),`
`22`	`22`	`LL ~ Object(Box<ObjectType>),`
`23`	`23`	`\|`