review comments

18 files changed, 69 insertions, 69 deletions

diff --git a/src/test/ui/array-slice-vec/infer_array_len.stderr b/src/test/ui/array-slice-vec/infer_array_len.stderr
index 11a07164e8c..c2a509a1963 100644
--- a/src/test/ui/array-slice-vec/infer_array_len.stderr
+++ b/src/test/ui/array-slice-vec/infer_array_len.stderr
@@ -4,10 +4,10 @@ error[E0282]: type annotations needed
 LL |     let [_, _] = a.into();
    |         ^^^^^^
    |
-help: consider giving this pattern a type, where the placeholder `Type` is specified
+help: consider giving this pattern a type
    |
-LL |     let [_, _]: Type = a.into();
-   |               ++++++
+LL |     let [_, _]: /* Type */ = a.into();
+   |               ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr b/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr
index 9e5705ba00b..7a04ed7381e 100644
--- a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr
+++ b/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr
@@ -4,10 +4,10 @@ error[E0282]: type annotations needed
 LL |     with_closure(|x: u32, y| {});
    |                           ^
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |     with_closure(|x: u32, y: Type| {});
-   |                            ++++++
+LL |     with_closure(|x: u32, y: /* Type */| {});
+   |                            ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/issue-52437.stderr b/src/test/ui/closures/issue-52437.stderr
index c635e743293..9ba24c7a886 100644
--- a/src/test/ui/closures/issue-52437.stderr
+++ b/src/test/ui/closures/issue-52437.stderr
@@ -10,10 +10,10 @@ error[E0282]: type annotations needed
 LL |     [(); &(&'static: loop { |x| {}; }) as *const _ as usize]
    |                              ^
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |     [(); &(&'static: loop { |x: Type| {}; }) as *const _ as usize]
-   |                               ++++++
+LL |     [(); &(&'static: loop { |x: /* Type */| {}; }) as *const _ as usize]
+   |                               ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/const-generics/issues/issue-83249.stderr b/src/test/ui/const-generics/issues/issue-83249.stderr
index f148cb7699e..7491fdc8a69 100644
--- a/src/test/ui/const-generics/issues/issue-83249.stderr
+++ b/src/test/ui/const-generics/issues/issue-83249.stderr
@@ -4,10 +4,10 @@ error[E0282]: type annotations needed
 LL |     let _ = foo([0; 1]);
    |         ^
    |
-help: consider giving this pattern a type, where the placeholder `Type` is specified
+help: consider giving this pattern a type
    |
-LL |     let _: Type = foo([0; 1]);
-   |          ++++++
+LL |     let _: /* Type */ = foo([0; 1]);
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/issues/issue-86719.stderr b/src/test/ui/impl-trait/issues/issue-86719.stderr
index 30bad841d15..7592418fdfd 100644
--- a/src/test/ui/impl-trait/issues/issue-86719.stderr
+++ b/src/test/ui/impl-trait/issues/issue-86719.stderr
@@ -18,10 +18,10 @@ error[E0282]: type annotations needed
 LL |         |_| true
    |          ^
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |         |_: Type| true
-   |           ++++++
+LL |         |_: /* Type */| true
+   |           ++++++++++++
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/inference/issue-72690.stderr b/src/test/ui/inference/issue-72690.stderr
index 37daeb6441f..8eda71ec09b 100644
--- a/src/test/ui/inference/issue-72690.stderr
+++ b/src/test/ui/inference/issue-72690.stderr
@@ -30,10 +30,10 @@ error[E0282]: type annotations needed
 LL |     |x| String::from("x".as_ref());
    |      ^
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |     |x: Type| String::from("x".as_ref());
-   |       ++++++
+LL |     |x: /* Type */| String::from("x".as_ref());
+   |       ++++++++++++
 
 error[E0283]: type annotations needed
   --> $DIR/issue-72690.rs:12:26
diff --git a/src/test/ui/issues/issue-18159.stderr b/src/test/ui/issues/issue-18159.stderr
index 1cfb0e41504..5e0589eed43 100644
--- a/src/test/ui/issues/issue-18159.stderr
+++ b/src/test/ui/issues/issue-18159.stderr
@@ -4,10 +4,10 @@ error[E0282]: type annotations needed
 LL |     let x;
    |         ^
    |
-help: consider giving `x` an explicit type, where the placeholder `Type` is specified
+help: consider giving `x` an explicit type
    |
-LL |     let x: Type;
-   |          ++++++
+LL |     let x: /* Type */;
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-2151.stderr b/src/test/ui/issues/issue-2151.stderr
index f689afd4ea7..c75038b6169 100644
--- a/src/test/ui/issues/issue-2151.stderr
+++ b/src/test/ui/issues/issue-2151.stderr
@@ -6,10 +6,10 @@ LL |     let x = panic!();
 LL |     x.clone();
    |     - type must be known at this point
    |
-help: consider giving `x` an explicit type, where the placeholder `Type` is specified
+help: consider giving `x` an explicit type
    |
-LL |     let x: Type = panic!();
-   |          ++++++
+LL |     let x: /* Type */ = panic!();
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-24036.stderr b/src/test/ui/issues/issue-24036.stderr
index 2413db2cada..0e73a51faed 100644
--- a/src/test/ui/issues/issue-24036.stderr
+++ b/src/test/ui/issues/issue-24036.stderr
@@ -17,10 +17,10 @@ error[E0282]: type annotations needed
 LL |         1 => |c| c + 1,
    |               ^
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |         1 => |c: Type| c + 1,
-   |                ++++++
+LL |         1 => |c: /* Type */| c + 1,
+   |                ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/lazy-type-alias-impl-trait/branches3.stderr b/src/test/ui/lazy-type-alias-impl-trait/branches3.stderr
index d14cad4d71c..fe2631f9474 100644
--- a/src/test/ui/lazy-type-alias-impl-trait/branches3.stderr
+++ b/src/test/ui/lazy-type-alias-impl-trait/branches3.stderr
@@ -4,10 +4,10 @@ error[E0282]: type annotations needed
 LL |         |s| s.len()
    |          ^  - type must be known at this point
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |         |s: Type| s.len()
-   |           ++++++
+LL |         |s: /* Type */| s.len()
+   |           ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/branches3.rs:15:10
@@ -15,10 +15,10 @@ error[E0282]: type annotations needed
 LL |         |s| s.len()
    |          ^  - type must be known at this point
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |         |s: Type| s.len()
-   |           ++++++
+LL |         |s: /* Type */| s.len()
+   |           ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/branches3.rs:23:10
@@ -26,10 +26,10 @@ error[E0282]: type annotations needed
 LL |         |s| s.len()
    |          ^  - type must be known at this point
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |         |s: Type| s.len()
-   |           ++++++
+LL |         |s: /* Type */| s.len()
+   |           ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/branches3.rs:30:10
@@ -37,10 +37,10 @@ error[E0282]: type annotations needed
 LL |         |s| s.len()
    |          ^  - type must be known at this point
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |         |s: Type| s.len()
-   |           ++++++
+LL |         |s: /* Type */| s.len()
+   |           ++++++++++++
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/match/match-unresolved-one-arm.stderr b/src/test/ui/match/match-unresolved-one-arm.stderr
index 0ebd56cb064..e3b501b2fd5 100644
--- a/src/test/ui/match/match-unresolved-one-arm.stderr
+++ b/src/test/ui/match/match-unresolved-one-arm.stderr
@@ -4,10 +4,10 @@ error[E0282]: type annotations needed
 LL |     let x = match () {
    |         ^
    |
-help: consider giving `x` an explicit type, where the placeholder `Type` is specified
+help: consider giving `x` an explicit type
    |
-LL |     let x: Type = match () {
-   |          ++++++
+LL |     let x: /* Type */ = match () {
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/pattern/pat-tuple-bad-type.stderr b/src/test/ui/pattern/pat-tuple-bad-type.stderr
index ff45e9fb7a3..da369d33397 100644
--- a/src/test/ui/pattern/pat-tuple-bad-type.stderr
+++ b/src/test/ui/pattern/pat-tuple-bad-type.stderr
@@ -7,10 +7,10 @@ LL |     let x;
 LL |         (..) => {}
    |         ---- type must be known at this point
    |
-help: consider giving `x` an explicit type, where the placeholder `Type` is specified
+help: consider giving `x` an explicit type
    |
-LL |     let x: Type;
-   |          ++++++
+LL |     let x: /* Type */;
+   |          ++++++++++++
 
 error[E0308]: mismatched types
   --> $DIR/pat-tuple-bad-type.rs:10:9
diff --git a/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr b/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr
index df0aa942fed..beba7def96f 100644
--- a/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr
+++ b/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr
@@ -191,10 +191,10 @@ error[E0282]: type annotations needed
 LL |     let x @ ..;
    |         ^^^^^^
    |
-help: consider giving this pattern a type, where the placeholder `Type` is specified
+help: consider giving this pattern a type
    |
-LL |     let x @ ..: Type;
-   |               ++++++
+LL |     let x @ ..: /* Type */;
+   |               ++++++++++++
 
 error: aborting due to 23 previous errors
 
diff --git a/src/test/ui/resolve/issue-85348.stderr b/src/test/ui/resolve/issue-85348.stderr
index 2cbc109055f..42b43f825d1 100644
--- a/src/test/ui/resolve/issue-85348.stderr
+++ b/src/test/ui/resolve/issue-85348.stderr
@@ -19,10 +19,10 @@ error[E0282]: type annotations needed
 LL |         let mut N;
    |             ^^^^^
    |
-help: consider giving `N` an explicit type, where the placeholder `Type` is specified
+help: consider giving `N` an explicit type
    |
-LL |         let mut N: Type;
-   |                  ++++++
+LL |         let mut N: /* Type */;
+   |                  ++++++++++++
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/span/method-and-field-eager-resolution.stderr b/src/test/ui/span/method-and-field-eager-resolution.stderr
index 554a2580c94..f6efbe40bc2 100644
--- a/src/test/ui/span/method-and-field-eager-resolution.stderr
+++ b/src/test/ui/span/method-and-field-eager-resolution.stderr
@@ -7,10 +7,10 @@ LL |
 LL |     x.0;
    |     - type must be known at this point
    |
-help: consider giving `x` an explicit type, where the placeholder `Type` is specified
+help: consider giving `x` an explicit type
    |
-LL |     let mut x: Type = Default::default();
-   |              ++++++
+LL |     let mut x: /* Type */ = Default::default();
+   |              ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/method-and-field-eager-resolution.rs:11:9
@@ -21,10 +21,10 @@ LL |
 LL |     x[0];
    |     - type must be known at this point
    |
-help: consider giving `x` an explicit type, where the placeholder `Type` is specified
+help: consider giving `x` an explicit type
    |
-LL |     let mut x: Type = Default::default();
-   |              ++++++
+LL |     let mut x: /* Type */ = Default::default();
+   |              ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/type-alias-impl-trait/closures_in_branches.stderr b/src/test/ui/type-alias-impl-trait/closures_in_branches.stderr
index 0d7341bfb91..9cc15f14a99 100644
--- a/src/test/ui/type-alias-impl-trait/closures_in_branches.stderr
+++ b/src/test/ui/type-alias-impl-trait/closures_in_branches.stderr
@@ -4,10 +4,10 @@ error[E0282]: type annotations needed
 LL |         |x| x.len()
    |          ^  - type must be known at this point
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |         |x: Type| x.len()
-   |           ++++++
+LL |         |x: /* Type */| x.len()
+   |           ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/closures_in_branches.rs:21:10
@@ -15,10 +15,10 @@ error[E0282]: type annotations needed
 LL |         |x| x.len()
    |          ^  - type must be known at this point
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |         |x: Type| x.len()
-   |           ++++++
+LL |         |x: /* Type */| x.len()
+   |           ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/type/type-check/unknown_type_for_closure.stderr b/src/test/ui/type/type-check/unknown_type_for_closure.stderr
index 01e053ccd51..e5e29aabf37 100644
--- a/src/test/ui/type/type-check/unknown_type_for_closure.stderr
+++ b/src/test/ui/type/type-check/unknown_type_for_closure.stderr
@@ -10,10 +10,10 @@ error[E0282]: type annotations needed
 LL |     let x = |_| {};
    |              ^
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |     let x = |_: Type| {};
-   |               ++++++
+LL |     let x = |_: /* Type */| {};
+   |               ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/unknown_type_for_closure.rs:10:14
diff --git a/src/test/ui/type/type-path-err-node-types.stderr b/src/test/ui/type/type-path-err-node-types.stderr
index 51077dedbbe..1aed1dbe4ba 100644
--- a/src/test/ui/type/type-path-err-node-types.stderr
+++ b/src/test/ui/type/type-path-err-node-types.stderr
@@ -28,10 +28,10 @@ error[E0282]: type annotations needed
 LL |     let _ = |a, b: _| -> _ { 0 };
    |              ^
    |
-help: consider giving this closure parameter an explicit type, where the placeholder `Type` is specified
+help: consider giving this closure parameter an explicit type
    |
-LL |     let _ = |a: Type, b: _| -> _ { 0 };
-   |               ++++++
+LL |     let _ = |a: /* Type */, b: _| -> _ { 0 };
+   |               ++++++++++++
 
 error: aborting due to 5 previous errors