Reword label as per review comment

estebank · estebank · commit 72d965f7b7c2 · 2019-01-12T19:36:28.000-08:00
diff --git a/src/librustc/infer/error_reporting/mod.rs b/src/librustc/infer/error_reporting/mod.rs
@@ -488,7 +488,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
     fn note_error_origin(&self, err: &mut DiagnosticBuilder<'tcx>, cause: &ObligationCause<'tcx>) {
         match cause.code {
             ObligationCauseCode::MatchExpressionArmPattern { span, ty } => {
-                err.span_label(span, format!("this match expression evaluates to `{}`", ty));
+                err.span_label(span, format!("this match expression has type `{}`", ty));
             }
             ObligationCauseCode::MatchExpressionArm { arm_span, source } => match source {
                 hir::MatchSource::IfLetDesugar { .. } => {
diff --git a/src/test/ui/block-result/issue-13624.stderr b/src/test/ui/block-result/issue-13624.stderr
@@ -13,7 +13,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-13624.rs:22:9
    |
 LL |       match enum_struct_variant {
-   |             ------------------- this match expression evaluates to `()`
+   |             ------------------- this match expression has type `()`
 LL |         a::Enum::EnumStructVariant { x, y, z } => {
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found enum `a::Enum`
    |
diff --git a/src/test/ui/error-codes/E0308-4.stderr b/src/test/ui/error-codes/E0308-4.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/E0308-4.rs:4:9
    |
 LL |     match x {
-   |           - this match expression evaluates to `u8`
+   |           - this match expression has type `u8`
 LL |         0u8..=3i8 => (), //~ ERROR E0308
    |         ^^^^^^^^^ expected u8, found i8
 
diff --git a/src/test/ui/issues/issue-11844.stderr b/src/test/ui/issues/issue-11844.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-11844.rs:6:9
    |
 LL |     match a {
-   |           - this match expression evaluates to `std::option::Option<std::boxed::Box<{integer}>>`
+   |           - this match expression has type `std::option::Option<std::boxed::Box<{integer}>>`
 LL |         Ok(a) => //~ ERROR: mismatched types
    |         ^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
    |
diff --git a/src/test/ui/issues/issue-12552.stderr b/src/test/ui/issues/issue-12552.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-12552.rs:6:5
    |
 LL |   match t {
-   |         - this match expression evaluates to `std::result::Result<_, {integer}>`
+   |         - this match expression has type `std::result::Result<_, {integer}>`
 LL |     Some(k) => match k { //~ ERROR mismatched types
    |     ^^^^^^^ expected enum `std::result::Result`, found enum `std::option::Option`
    |
diff --git a/src/test/ui/issues/issue-13466.stderr b/src/test/ui/issues/issue-13466.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-13466.rs:8:9
    |
 LL |     let _x: usize = match Some(1) {
-   |                           ------- this match expression evaluates to `std::option::Option<{integer}>`
+   |                           ------- this match expression has type `std::option::Option<{integer}>`
 LL |         Ok(u) => u,
    |         ^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
    |
@@ -13,7 +13,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-13466.rs:14:9
    |
 LL |     let _x: usize = match Some(1) {
-   |                           ------- this match expression evaluates to `std::option::Option<{integer}>`
+   |                           ------- this match expression has type `std::option::Option<{integer}>`
 ...
 LL |         Err(e) => panic!(e)
    |         ^^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
diff --git a/src/test/ui/issues/issue-15896.stderr b/src/test/ui/issues/issue-15896.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-15896.rs:11:11
    |
 LL |     let u = match e {
-   |                   - this match expression evaluates to `main::R`
+   |                   - this match expression has type `main::R`
 LL |         E::B(
 LL |           Tau{t: x},
    |           ^^^^^^^^^ expected enum `main::R`, found struct `main::Tau`
diff --git a/src/test/ui/issues/issue-16401.stderr b/src/test/ui/issues/issue-16401.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-16401.rs:8:9
    |
 LL |     match () {
-   |           -- this match expression evaluates to `()`
+   |           -- this match expression has type `()`
 LL |         Slice { data: data, len: len } => (),
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `Slice`
    |
diff --git a/src/test/ui/issues/issue-3680.stderr b/src/test/ui/issues/issue-3680.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-3680.rs:3:9
    |
 LL |     match None {
-   |           ---- this match expression evaluates to `std::option::Option<_>`
+   |           ---- this match expression has type `std::option::Option<_>`
 LL |         Err(_) => ()
    |         ^^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
    |
diff --git a/src/test/ui/issues/issue-5100.stderr b/src/test/ui/issues/issue-5100.stderr
@@ -29,7 +29,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-5100.rs:33:9
    |
 LL |     match (true, false) {
-   |           ------------- this match expression evaluates to `(bool, bool)`
+   |           ------------- this match expression has type `(bool, bool)`
 LL |         box (true, false) => ()
    |         ^^^^^^^^^^^^^^^^^ expected tuple, found struct `std::boxed::Box`
    |
diff --git a/src/test/ui/issues/issue-5358-1.stderr b/src/test/ui/issues/issue-5358-1.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-5358-1.rs:6:9
    |
 LL |     match S(Either::Left(5)) {
-   |           ------------------ this match expression evaluates to `S`
+   |           ------------------ this match expression has type `S`
 LL |         Either::Right(_) => {}
    |         ^^^^^^^^^^^^^^^^ expected struct `S`, found enum `Either`
    |
diff --git a/src/test/ui/issues/issue-7092.stderr b/src/test/ui/issues/issue-7092.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-7092.rs:6:9
    |
 LL |     match x {
-   |           - this match expression evaluates to `Whatever`
+   |           - this match expression has type `Whatever`
 LL |         Some(field) =>
    |         ^^^^^^^^^^^ expected enum `Whatever`, found enum `std::option::Option`
    |
diff --git a/src/test/ui/match/match-range-fail.stderr b/src/test/ui/match/match-range-fail.stderr
@@ -20,7 +20,7 @@ error[E0308]: mismatched types
   --> $DIR/match-range-fail.rs:17:9
    |
 LL |     match 5 {
-   |           - this match expression evaluates to `{integer}`
+   |           - this match expression has type `{integer}`
 LL |         'c' ..= 100 => { }
    |         ^^^^^^^^^^^ expected integer, found char
    |
diff --git a/src/test/ui/match/match-struct.stderr b/src/test/ui/match/match-struct.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/match-struct.rs:6:9
    |
 LL |     match (S { a: 1 }) {
-   |           ------------ this match expression evaluates to `S`
+   |           ------------ this match expression has type `S`
 LL |         E::C(_) => (),
    |         ^^^^^^^ expected struct `S`, found enum `E`
    |
diff --git a/src/test/ui/match/match-tag-unary.stderr b/src/test/ui/match/match-tag-unary.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL | fn main() { let x: A = A::A(0); match x { B::B(y) => { } } } //~ ERROR mismatched types
    |                                       -   ^^^^^^^ expected enum `A`, found enum `B`
    |                                       |
-   |                                       this match expression evaluates to `A`
+   |                                       this match expression has type `A`
    |
    = note: expected type `A`
               found type `B`
diff --git a/src/test/ui/mismatched_types/E0409.stderr b/src/test/ui/mismatched_types/E0409.stderr
@@ -10,7 +10,7 @@ error[E0308]: mismatched types
   --> $DIR/E0409.rs:5:23
    |
 LL |     match x {
-   |           - this match expression evaluates to `_`
+   |           - this match expression has type `_`
 LL |         (0, ref y) | (y, 0) => {} //~ ERROR E0409
    |                       ^ expected &{integer}, found integer
    |
diff --git a/src/test/ui/or-pattern-mismatch.stderr b/src/test/ui/or-pattern-mismatch.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL | fn main() { match Blah::A(1, 1, 2) { Blah::A(_, x, y) | Blah::B(x, y) => { } } }
    |                   ----------------                                 ^ expected usize, found isize
    |                   |
-   |                   this match expression evaluates to `_`
+   |                   this match expression has type `_`
    |
    = note: expected type `usize`
               found type `isize`
diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr
@@ -22,7 +22,7 @@ error[E0308]: mismatched types
   --> $DIR/pattern-error-continue.rs:22:9
    |
 LL |     match 'c' {
-   |           --- this match expression evaluates to `char`
+   |           --- this match expression has type `char`
 LL |         S { .. } => (),
    |         ^^^^^^^^ expected char, found struct `S`
    |
diff --git a/src/test/ui/pattern/pattern-tyvar.stderr b/src/test/ui/pattern/pattern-tyvar.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/pattern-tyvar.rs:5:18
    |
 LL |     match t {
-   |           - this match expression evaluates to `std::option::Option<std::vec::Vec<isize>>`
+   |           - this match expression has type `std::option::Option<std::vec::Vec<isize>>`
 LL |       Bar::T1(_, Some::<isize>(x)) => { //~ ERROR mismatched types
    |                  ^^^^^^^^^^^^^^^^ expected struct `std::vec::Vec`, found isize
    |
diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr b/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr
@@ -24,7 +24,7 @@ error[E0308]: mismatched types
   --> $DIR/resolve-inconsistent-binding-mode.rs:7:32
    |
 LL |     match x {
-   |           - this match expression evaluates to `_`
+   |           - this match expression has type `_`
 LL |       Opts::A(ref i) | Opts::B(i) => {}
    |                                ^ expected &isize, found isize
    |
@@ -35,7 +35,7 @@ error[E0308]: mismatched types
   --> $DIR/resolve-inconsistent-binding-mode.rs:16:32
    |
 LL |     match x {
-   |           - this match expression evaluates to `_`
+   |           - this match expression has type `_`
 LL |       Opts::A(ref i) | Opts::B(i) => {}
    |                                ^ expected &isize, found isize
    |
@@ -46,7 +46,7 @@ error[E0308]: mismatched types
   --> $DIR/resolve-inconsistent-binding-mode.rs:25:36
    |
 LL |     match x {
-   |           - this match expression evaluates to `_`
+   |           - this match expression has type `_`
 LL |       Opts::A(ref mut i) | Opts::B(ref i) => {}
    |                                    ^^^^^ types differ in mutability
    |
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
@@ -110,7 +110,7 @@ error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:54:9
    |
 LL |     match (Point { x: 1, y: 2 }) {
-   |           ---------------------- this match expression evaluates to `Point<{integer}>`
+   |           ---------------------- this match expression has type `Point<{integer}>`
 LL |         PointF::<u32> { .. } => {} //~ ERROR wrong number of type arguments
    |         ^^^^^^^^^^^^^^^^^^^^ expected integer, found f32
    |
@@ -121,7 +121,7 @@ error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:59:9
    |
 LL |     match (Point { x: 1, y: 2 }) {
-   |           ---------------------- this match expression evaluates to `Point<{integer}>`
+   |           ---------------------- this match expression has type `Point<{integer}>`
 LL |         PointF { .. } => {} //~ ERROR mismatched types
    |         ^^^^^^^^^^^^^ expected integer, found f32
    |
@@ -132,7 +132,7 @@ error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:67:9
    |
 LL |     match (Pair { x: 1, y: 2 }) {
-   |           --------------------- this match expression evaluates to `Pair<{integer}, {integer}>`
+   |           --------------------- this match expression has type `Pair<{integer}, {integer}>`
 LL |         PairF::<u32> { .. } => {} //~ ERROR mismatched types
    |         ^^^^^^^^^^^^^^^^^^^ expected integer, found f32
    |

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {`
`488`	`488`	`fn note_error_origin(&self, err: &mut DiagnosticBuilder<'tcx>, cause: &ObligationCause<'tcx>) {`
`489`	`489`	`match cause.code {`
`490`	`490`	`ObligationCauseCode::MatchExpressionArmPattern { span, ty } => {`
`491`		- err.span_label(span, format!("this match expression evaluates to `{}`", ty));
	`491`	+ err.span_label(span, format!("this match expression has type `{}`", ty));
`492`	`492`	`}`
`493`	`493`	`ObligationCauseCode::MatchExpressionArm { arm_span, source } => match source {`
`494`	`494`	`hir::MatchSource::IfLetDesugar { .. } => {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ error[E0308]: mismatched types`
`13`	`13`	`--> $DIR/issue-13624.rs:22:9`
`14`	`14`	`\|`
`15`	`15`	`LL \| match enum_struct_variant {`
`16`		- \| ------------------- this match expression evaluates to `()`
	`16`	+ \| ------------------- this match expression has type `()`
`17`	`17`	`LL \| a::Enum::EnumStructVariant { x, y, z } => {`
`18`	`18`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found enum `a::Enum`
`19`	`19`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/E0308-4.rs:4:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| match x {`
`5`		- \| - this match expression evaluates to `u8`
	`5`	+ \| - this match expression has type `u8`
`6`	`6`	`LL \| 0u8..=3i8 => (), //~ ERROR E0308`
`7`	`7`	`\| ^^^^^^^^^ expected u8, found i8`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/issue-11844.rs:6:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| match a {`
`5`		- \| - this match expression evaluates to `std::option::Option<std::boxed::Box<{integer}>>`
	`5`	+ \| - this match expression has type `std::option::Option<std::boxed::Box<{integer}>>`
`6`	`6`	`LL \| Ok(a) => //~ ERROR: mismatched types`
`7`	`7`	\| ^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/issue-12552.rs:6:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| match t {`
`5`		- \| - this match expression evaluates to `std::result::Result<_, {integer}>`
	`5`	+ \| - this match expression has type `std::result::Result<_, {integer}>`
`6`	`6`	`LL \| Some(k) => match k { //~ ERROR mismatched types`
`7`	`7`	\| ^^^^^^^ expected enum `std::result::Result`, found enum `std::option::Option`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/issue-13466.rs:8:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| let _x: usize = match Some(1) {`
`5`		- \| ------- this match expression evaluates to `std::option::Option<{integer}>`
	`5`	+ \| ------- this match expression has type `std::option::Option<{integer}>`
`6`	`6`	`LL \| Ok(u) => u,`
`7`	`7`	\| ^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
`8`	`8`	`\|`
`@@ -13,7 +13,7 @@ error[E0308]: mismatched types`
`13`	`13`	`--> $DIR/issue-13466.rs:14:9`
`14`	`14`	`\|`
`15`	`15`	`LL \| let _x: usize = match Some(1) {`
`16`		- \| ------- this match expression evaluates to `std::option::Option<{integer}>`
	`16`	+ \| ------- this match expression has type `std::option::Option<{integer}>`
`17`	`17`	`...`
`18`	`18`	`LL \| Err(e) => panic!(e)`
`19`	`19`	\| ^^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/issue-15896.rs:11:11`
`3`	`3`	`\|`
`4`	`4`	`LL \| let u = match e {`
`5`		- \| - this match expression evaluates to `main::R`
	`5`	+ \| - this match expression has type `main::R`
`6`	`6`	`LL \| E::B(`
`7`	`7`	`LL \| Tau{t: x},`
`8`	`8`	\| ^^^^^^^^^ expected enum `main::R`, found struct `main::Tau`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/issue-16401.rs:8:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| match () {`
`5`		- \| -- this match expression evaluates to `()`
	`5`	+ \| -- this match expression has type `()`
`6`	`6`	`LL \| Slice { data: data, len: len } => (),`
`7`	`7`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `Slice`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/issue-3680.rs:3:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| match None {`
`5`		- \| ---- this match expression evaluates to `std::option::Option<_>`
	`5`	+ \| ---- this match expression has type `std::option::Option<_>`
`6`	`6`	`LL \| Err(_) => ()`
`7`	`7`	\| ^^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ error[E0308]: mismatched types`
`29`	`29`	`--> $DIR/issue-5100.rs:33:9`
`30`	`30`	`\|`
`31`	`31`	`LL \| match (true, false) {`
`32`		- \| ------------- this match expression evaluates to `(bool, bool)`
	`32`	+ \| ------------- this match expression has type `(bool, bool)`
`33`	`33`	`LL \| box (true, false) => ()`
`34`	`34`	\| ^^^^^^^^^^^^^^^^^ expected tuple, found struct `std::boxed::Box`
`35`	`35`	`\|`