---

pcwalton · pcwalton · commit 4c8012007ccd · 2011-05-13T14:39:00.000-07:00
yaml --- r: 2518 b: refs/heads/master c: e888fe6 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f440b1452f79a670d2927abd42f95b79272c5d9
+refs/heads/master: e888fe6f9b8ed0c47df2ed17e50c2d391c1dc647
diff --git a/trunk/src/comp/middle/ty.rs b/trunk/src/comp/middle/ty.rs
@@ -1504,8 +1504,8 @@ fn ann_to_monotype(ctxt cx,  &node_type_table ntt, ast::ann a) -> t {
 }
 
 // Turns a type into an ann_type, using defaults for other fields.
-fn triv_ann(&ast::ann old, t typ) -> ast::ann {
-    ret ast::ann_type(ast::ann_tag(old), typ, none[vec[t]], none[@ts_ann]);
+fn triv_ann(uint node_id, t typ) -> ast::ann {
+    ret ast::ann_type(node_id, typ, none[vec[t]], none[@ts_ann]);
 }
 
 // Returns the number of distinct type parameters in the given type.
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 2f440b1452f79a670d2927abd42f95b79272c5d9`
	`2`	`+refs/heads/master: e888fe6f9b8ed0c47df2ed17e50c2d391c1dc647`
Original file line number	Diff line number	Diff line change
`@@ -1504,8 +1504,8 @@ fn ann_to_monotype(ctxt cx, &node_type_table ntt, ast::ann a) -> t {`
`1504`	`1504`	`}`
`1505`	`1505`
`1506`	`1506`	`// Turns a type into an ann_type, using defaults for other fields.`
`1507`		`-fn triv_ann(&ast::ann old, t typ) -> ast::ann {`
`1508`		`- ret ast::ann_type(ast::ann_tag(old), typ, none[vec[t]], none[@ts_ann]);`
	`1507`	`+fn triv_ann(uint node_id, t typ) -> ast::ann {`
	`1508`	`+ ret ast::ann_type(node_id, typ, none[vec[t]], none[@ts_ann]);`
`1509`	`1509`	`}`
`1510`	`1510`
`1511`	`1511`	`// Returns the number of distinct type parameters in the given type.`