use span_suggestion instead of span_suggestion_verbose

rust-lang · Aug 15, 2022 · 12e609b · 12e609b
1 parent 4d1b5f0
commit 12e609b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/compiler/rustc_typeck/src/check/expr.rs b/compiler/rustc_typeck/src/check/expr.rs
@@ -1328,9 +1328,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             {
                 match self.tcx.sess.diagnostic().steal_diagnostic(span, StashKey::UnderscoreForArrayLengths) {
                     Some(mut err) => {
-                        err.span_suggestion_verbose(
+                        err.span_suggestion(
                             span,
-                            "consider adding an array length",
+                            "consider specifying the array length",
                             array_len,
                             Applicability::MaybeIncorrect,
                         );

diff --git a/src/test/ui/array-slice-vec/suggest-array-length.stderr b/src/test/ui/array-slice-vec/suggest-array-length.stderr
@@ -20,40 +20,28 @@ error[E0658]: using `_` for array lengths is unstable
   --> $DIR/suggest-array-length.rs:5:22
    |
 LL |     const Foo: [i32; _] = [1, 2, 3];
-   |                      ^
+   |                      ^ help: consider specifying the array length: `3`
    |
    = note: see issue #85077 <https://github.com/rust-lang/rust/issues/85077> for more information
    = help: add `#![feature(generic_arg_infer)]` to the crate attributes to enable
-help: consider adding an array length
-   |
-LL |     const Foo: [i32; 3] = [1, 2, 3];
-   |                      ~
 
 error[E0658]: using `_` for array lengths is unstable
   --> $DIR/suggest-array-length.rs:8:20
    |
 LL |     let foo: [i32; _] = [1, 2, 3];
-   |                    ^
+   |                    ^ help: consider specifying the array length: `3`
    |
    = note: see issue #85077 <https://github.com/rust-lang/rust/issues/85077> for more information
    = help: add `#![feature(generic_arg_infer)]` to the crate attributes to enable
-help: consider adding an array length
-   |
-LL |     let foo: [i32; 3] = [1, 2, 3];
-   |                    ~
 
 error[E0658]: using `_` for array lengths is unstable
   --> $DIR/suggest-array-length.rs:11:20
    |
 LL |     let bar: [i32; _] = [0; 3];
-   |                    ^
+   |                    ^ help: consider specifying the array length: `3`
    |
    = note: see issue #85077 <https://github.com/rust-lang/rust/issues/85077> for more information
    = help: add `#![feature(generic_arg_infer)]` to the crate attributes to enable
-help: consider adding an array length
-   |
-LL |     let bar: [i32; 3] = [0; 3];
-   |                    ~
 
 error: aborting due to 6 previous errors
 

diff --git a/src/test/ui/feature-gates/feature-gate-generic_arg_infer.normal.stderr b/src/test/ui/feature-gates/feature-gate-generic_arg_infer.normal.stderr
@@ -14,14 +14,10 @@ error[E0658]: using `_` for array lengths is unstable
   --> $DIR/feature-gate-generic_arg_infer.rs:14:18
    |
 LL |     let _y: [u8; _] = [0; 3];
-   |                  ^
+   |                  ^ help: consider specifying the array length: `3`
    |
    = note: see issue #85077 <https://github.com/rust-lang/rust/issues/85077> for more information
    = help: add `#![feature(generic_arg_infer)]` to the crate attributes to enable
-help: consider adding an array length
-   |
-LL |     let _y: [u8; 3] = [0; 3];
-   |                  ~
 
 error[E0747]: type provided when a constant was expected
   --> $DIR/feature-gate-generic_arg_infer.rs:20:20