---

brson · brson · commit 4bd130795642 · 2011-11-13T13:55:12.000-08:00
yaml --- r: 6261 b: refs/heads/master c: 3cc2641 h: refs/heads/master i: 6259: e6c63a3 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 768306baddc07ca8f43dd20c76f4647727a35cd7
+refs/heads/master: 3cc2641fc389dcdf8b348c1a9dbc6dfe48c5547a
diff --git a/trunk/src/comp/middle/ty.rs b/trunk/src/comp/middle/ty.rs
@@ -2902,7 +2902,6 @@ fn is_binopable(cx: ctxt, ty: t, op: ast::binop) -> bool {
           ty_machine(ast::ty_f32.) { tycat_float }
           ty_machine(ast::ty_f64.) { tycat_float }
           ty_char. { tycat_int }
-          ty_ptr(_) { tycat_int }
           ty_str. { tycat_str }
           ty_vec(_) { tycat_vec }
           ty_rec(_) { tycat_struct }
diff --git a/trunk/src/test/compile-fail/binop-add-ptr.rs b/trunk/src/test/compile-fail/binop-add-ptr.rs
@@ -0,0 +1,4 @@
+// error-pattern:binary operation + cannot be applied to type `*i`
+
+fn die() -> *int { (0 as *int) + (0 as *int) }
+fn main() { }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 768306baddc07ca8f43dd20c76f4647727a35cd7`
	`2`	`+refs/heads/master: 3cc2641fc389dcdf8b348c1a9dbc6dfe48c5547a`