---

erickt · nikomatsakis · commit 2c2959805504 · 2012-08-27T14:10:55.000-07:00
yaml --- r: 30127 b: refs/heads/incoming c: ad19609 h: refs/heads/master i: 30125: 46de31c 30123: ab72744 30119: 45f6c84 30111: c833aba v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: c83ab4bcb8bf1677c3a4763418dd98520050c469
+refs/heads/incoming: ad19609dbce8bae2dcbb7debb0ed4a7d9b490d31
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/rustc/middle/typeck/infer/region_var_bindings.rs b/branches/incoming/src/rustc/middle/typeck/infer/region_var_bindings.rs
@@ -1020,7 +1020,7 @@ impl RegionVarBindings {
                     self.report_error_for_expanding_node(
                         graph, dup_map, node_vid);
                   }
-                  Contraction => {
+                  Contracting => {
                     self.report_error_for_contracting_node(
                         graph, dup_map, node_vid);
                   }

Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,7 @@ impl RegionVarBindings {`
`1020`	`1020`	`self.report_error_for_expanding_node(`
`1021`	`1021`	`graph, dup_map, node_vid);`
`1022`	`1022`	`}`
`1023`		`- Contraction => {`
	`1023`	`+ Contracting => {`
`1024`	`1024`	`self.report_error_for_contracting_node(`
`1025`	`1025`	`graph, dup_map, node_vid);`
`1026`	`1026`	`}`