---

catamorphism · catamorphism · commit 7948cab21a9e · 2011-05-23T19:46:27.000-07:00
yaml --- r: 2753 b: refs/heads/master c: c9a8bde h: refs/heads/master i: 2751: b0c1ac1 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 776977b755947dbcb67b439fb7c3779a5cb6766e
+refs/heads/master: c9a8bdee2f777671a30f93339016fae044b1a081
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs
@@ -1570,6 +1570,11 @@ mod writeback {
             }
         }
 
+        if (ty::type_contains_vars(fcx.ccx.tcx, local_ty)) {
+            fcx.ccx.tcx.sess.span_err(sp,
+              "Ambiguous type " + ty_to_str(fcx.ccx.tcx, local_ty)
+             + "\n(Try adding more type annotations.)");
+        }
         write::ty_only(fcx.ccx.tcx, local.ann.id, local_ty);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 776977b755947dbcb67b439fb7c3779a5cb6766e`
	`2`	`+refs/heads/master: c9a8bdee2f777671a30f93339016fae044b1a081`
Original file line number	Diff line number	Diff line change
`@@ -1570,6 +1570,11 @@ mod writeback {`
`1570`	`1570`	`}`
`1571`	`1571`	`}`
`1572`	`1572`
	`1573`	`+ if (ty::type_contains_vars(fcx.ccx.tcx, local_ty)) {`
	`1574`	`+ fcx.ccx.tcx.sess.span_err(sp,`
	`1575`	`+ "Ambiguous type " + ty_to_str(fcx.ccx.tcx, local_ty)`
	`1576`	`+ + "\n(Try adding more type annotations.)");`
	`1577`	`+ }`
`1573`	`1578`	`write::ty_only(fcx.ccx.tcx, local.ann.id, local_ty);`
`1574`	`1579`	`}`
`1575`	`1580`