---

yaml
---
r: 152186
b: refs/heads/try2
c: 356423d
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5527c5dc060754d7ca17c19886bc357ef29ec8fc
+refs/heads/try2: 356423d8f1c308f0dc77f803f8ed00c7e80305f3
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/check/_match.rs

@@ -87,7 +87,7 @@ pub fn check_match(fcx: &FnCtxt,
         result_ty =
             infer::common_supertype(
                 fcx.infcx(),
-                infer::MatchExpressionArm(expr.span, arm.body.span),
+                infer::MatchExpression(expr.span),
                 true, // result_ty is "expected" here
                 result_ty,
                 bty);

branches/try2/src/librustc/middle/typeck/infer/error_reporting.rs

@@ -346,7 +346,7 @@ impl<'a> ErrorReporting for InferCtxt<'a> {
             infer::ExprAssignable(_) => "mismatched types",
             infer::RelateTraitRefs(_) => "mismatched traits",
             infer::RelateSelfType(_) => "mismatched types",
-            infer::MatchExpressionArm(_, _) => "match arms have incompatible types",
+            infer::MatchExpression(_) => "match arms have incompatible types",
             infer::IfExpression(_) => "if and else have incompatible types",
         };
 
@@ -356,12 +356,6 @@ impl<'a> ErrorReporting for InferCtxt<'a> {
                  message_root_str,
                  expected_found_str,
                  ty::type_err_to_str(self.tcx, terr)).as_slice());
-
-        match trace.origin {
-            infer::MatchExpressionArm(_, arm_span) =>
-                self.tcx.sess.span_note(arm_span, "match arm with an incompatible type"),
-            _ => ()
-        }
     }
 
     fn report_and_explain_type_error(&self,
@@ -1287,7 +1281,7 @@ impl<'a> ErrorReportingHelpers for InferCtxt<'a> {
                     infer::RelateSelfType(_) => {
                         format!("type matches impl")
                     }
-                    infer::MatchExpressionArm(_, _) => {
+                    infer::MatchExpression(_) => {
                         format!("match arms have compatible types")
                     }
                     infer::IfExpression(_) => {

branches/try2/src/librustc/middle/typeck/infer/mod.rs

@@ -116,8 +116,8 @@ pub enum TypeOrigin {
     // Relating trait refs when resolving vtables
     RelateSelfType(Span),
 
-    // Computing common supertype in the arms of a match expression
-    MatchExpressionArm(Span, Span),
+    // Computing common supertype in a match expression
+    MatchExpression(Span),
 
     // Computing common supertype in an if expression
     IfExpression(Span),
@@ -831,7 +831,7 @@ impl TypeOrigin {
             Misc(span) => span,
             RelateTraitRefs(span) => span,
             RelateSelfType(span) => span,
-            MatchExpressionArm(match_span, _) => match_span,
+            MatchExpression(span) => span,
             IfExpression(span) => span,
         }
     }
@@ -853,8 +853,8 @@ impl Repr for TypeOrigin {
             RelateSelfType(a) => {
                 format!("RelateSelfType({})", a.repr(tcx))
             }
-            MatchExpressionArm(a, b) => {
-                format!("MatchExpressionArm({}, {})", a.repr(tcx), b.repr(tcx))
+            MatchExpression(a) => {
+                format!("MatchExpression({})", a.repr(tcx))
             }
             IfExpression(a) => {
                 format!("IfExpression({})", a.repr(tcx))