review comments: tweak prefix strings

Author: estebank

src/librustc/ty/error.rs

@@ -252,7 +252,7 @@ impl<'tcx> ty::TyS<'tcx> {
         match self.kind {
             ty::Infer(_) | ty::Error | ty::Bool | ty::Char | ty::Int(_) |
             ty::Uint(_) | ty::Float(_) | ty::Str | ty::Never => "type".into(),
-            ty::Tuple(ref tys) if tys.is_empty() => "type".into(),
+            ty::Tuple(ref tys) if tys.is_empty() => "unit type".into(),
             ty::Adt(def, _) => def.descr().into(),
             ty::Foreign(_) => "extern type".into(),
             ty::Array(..) => "array".into(),
@@ -264,13 +264,13 @@ impl<'tcx> ty::TyS<'tcx> {
             }.into(),
             ty::FnDef(..) => "fn item".into(),
             ty::FnPtr(_) => "fn pointer".into(),
-            ty::Dynamic(..) => "trait".into(),
+            ty::Dynamic(..) => "trait object".into(),
             ty::Closure(..) => "closure".into(),
             ty::Generator(..) => "generator".into(),
             ty::GeneratorWitness(..) => "generator witness".into(),
             ty::Tuple(..) => "tuple".into(),
-            ty::Placeholder(..) => "placeholder type".into(),
-            ty::Bound(..) => "bound type".into(),
+            ty::Placeholder(..) => "higher-ranked type".into(),
+            ty::Bound(..) => "bound type variable".into(),
             ty::Projection(_) => "associated type".into(),
             ty::UnnormalizedProjection(_) => "associated type".into(),
             ty::Param(_) => "type parameter".into(),

src/test/ui/arg-type-mismatch.stderr

@@ -4,8 +4,8 @@ error[E0308]: mismatched types
 LL | fn main() { let i: (); i = f(()); }
    |                              ^^ expected isize, found ()
    |
-   = note: expected type `isize`
-              found type `()`
+   = note:   expected type `isize`
+           found unit type `()`
 
 error: aborting due to previous error
 

src/test/ui/array-break-length.stderr

@@ -16,17 +16,17 @@ error[E0308]: mismatched types
 LL |         |_: [_; break]| {}
    |         ^^^^^^^^^^^^^^^^^^ expected (), found closure
    |
-   = note: expected type `()`
-           found closure `[closure@$DIR/array-break-length.rs:3:9: 3:27]`
+   = note: expected unit type `()`
+                found closure `[closure@$DIR/array-break-length.rs:3:9: 3:27]`
 
 error[E0308]: mismatched types
   --> $DIR/array-break-length.rs:8:9
    |
 LL |         |_: [_; continue]| {}
    |         ^^^^^^^^^^^^^^^^^^^^^ expected (), found closure
    |
-   = note: expected type `()`
-           found closure `[closure@$DIR/array-break-length.rs:8:9: 8:30]`
+   = note: expected unit type `()`
+                found closure `[closure@$DIR/array-break-length.rs:8:9: 8:30]`
 
 error: aborting due to 4 previous errors
 

src/test/ui/associated-types/issue-44153.stderr

@@ -7,8 +7,8 @@ LL |     fn visit() {}
 LL |     <() as Visit>::visit();
    |     ^^^^^^^^^^^^^^^^^^^^ expected (), found &()
    |
-   = note:   expected type `()`
-           found reference `&()`
+   = note: expected unit type `()`
+              found reference `&()`
    = note: required because of the requirements on the impl of `Visit` for `()`
 
 error: aborting due to previous error

src/test/ui/associated-types/point-at-type-on-obligation-failure.stderr

@@ -9,8 +9,8 @@ LL | impl Bar for Foo {
 LL |     type Ok = ();
    |     ^^^^^^^^^^^^^ expected u32, found ()
    |
-   = note: expected type `u32`
-              found type `()`
+   = note:   expected type `u32`
+           found unit type `()`
 
 error: aborting due to previous error
 

src/test/ui/async-await/async-block-control-flow-static-semantics.stderr

@@ -26,17 +26,17 @@ LL | fn return_targets_async_block_not_fn() -> u8 {
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
    |
-   = note: expected type `u8`
-              found type `()`
+   = note:   expected type `u8`
+           found unit type `()`
 
 error[E0271]: type mismatch resolving `<impl std::future::Future as std::future::Future>::Output == ()`
   --> $DIR/async-block-control-flow-static-semantics.rs:18:39
    |
 LL |     let _: &dyn Future<Output = ()> = &block;
    |                                       ^^^^^^ expected (), found u8
    |
-   = note: expected type `()`
-              found type `u8`
+   = note: expected unit type `()`
+                   found type `u8`
    = note: required for the cast to the object type `dyn std::future::Future<Output = ()>`
 
 error[E0308]: mismatched types
@@ -52,17 +52,17 @@ LL | |
 LL | | }
    | |_^ expected u8, found ()
    |
-   = note: expected type `u8`
-              found type `()`
+   = note:   expected type `u8`
+           found unit type `()`
 
 error[E0271]: type mismatch resolving `<impl std::future::Future as std::future::Future>::Output == ()`
   --> $DIR/async-block-control-flow-static-semantics.rs:27:39
    |
 LL |     let _: &dyn Future<Output = ()> = &block;
    |                                       ^^^^^^ expected (), found u8
    |
-   = note: expected type `()`
-              found type `u8`
+   = note: expected unit type `()`
+                   found type `u8`
    = note: required for the cast to the object type `dyn std::future::Future<Output = ()>`
 
 error[E0308]: mismatched types
@@ -73,8 +73,8 @@ LL | fn rethrow_targets_async_block_not_fn() -> Result<u8, MyErr> {
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
    |
-   = note: expected enum `std::result::Result<u8, MyErr>`
-              found type `()`
+   = note:   expected enum `std::result::Result<u8, MyErr>`
+           found unit type `()`
 
 error[E0308]: mismatched types
   --> $DIR/async-block-control-flow-static-semantics.rs:57:50
@@ -84,8 +84,8 @@ LL | fn rethrow_targets_async_block_not_async_fn() -> Result<u8, MyErr> {
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
    |
-   = note: expected enum `std::result::Result<u8, MyErr>`
-              found type `()`
+   = note:   expected enum `std::result::Result<u8, MyErr>`
+           found unit type `()`
 
 error: aborting due to 8 previous errors
 

src/test/ui/block-expression-remove-semicolon.stderr

@@ -9,8 +9,8 @@ LL | |         foo();
 LL | |     };
    | |_____^ expected i32, found ()
    |
-   = note: expected type `i32`
-              found type `()`
+   = note:   expected type `i32`
+           found unit type `()`
 
 error: aborting due to previous error
 

src/test/ui/block-result/block-must-not-have-result-do.stderr

@@ -4,8 +4,8 @@ error[E0308]: mismatched types
 LL |         true
    |         ^^^^ expected (), found bool
    |
-   = note: expected type `()`
-              found type `bool`
+   = note: expected unit type `()`
+                   found type `bool`
 
 error: aborting due to previous error
 

src/test/ui/block-result/block-must-not-have-result-res.stderr

@@ -6,8 +6,8 @@ LL |     fn drop(&mut self) {
 LL |         true
    |         ^^^^ expected (), found bool
    |
-   = note: expected type `()`
-              found type `bool`
+   = note: expected unit type `()`
+                   found type `bool`
 
 error: aborting due to previous error
 

src/test/ui/block-result/block-must-not-have-result-while.rs

@@ -1,7 +1,7 @@
 fn main() {
     while true { //~ WARN denote infinite loops with
         true //~  ERROR mismatched types
-             //~| expected type `()`
+             //~| expected unit type `()`
              //~| found type `bool`
              //~| expected (), found bool
     }