---

catamorphism · catamorphism · commit c2e3301ad220 · 2012-10-15T13:14:23.000-07:00
yaml --- r: 35951 b: refs/heads/try2 c: 0643466 h: refs/heads/master i: 35949: 3e1e507 35947: f3f81fd 35943: 725e22f 35935: d0e9a14 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 7237268b7040edf09dbbd9522b5656227a4b9b91
+refs/heads/try2: 0643466f85a765bbd0d7ec14a96e0980795aebec
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/rustc/middle/resolve.rs b/branches/try2/src/rustc/middle/resolve.rs
@@ -3199,7 +3199,7 @@ impl Resolver {
                         // resolve the discriminator expr
                         // as a constant
                         self.with_constant_rib(|| {
-                            self.resolve_expr(*dis_expr, visitor); 
+                            self.resolve_expr(*dis_expr, visitor);
                         });
                     }
                 }
@@ -3215,7 +3215,7 @@ impl Resolver {
                     visit_item(item, (), visitor);
                 }
             }
-                
+
             item_ty(_, type_parameters) => {
                 do self.with_type_parameter_rib
                         (HasTypeParameters(&type_parameters, item.id, 0u,

Original file line number	Diff line number	Diff line change
`@@ -3199,7 +3199,7 @@ impl Resolver {`
`3199`	`3199`	`// resolve the discriminator expr`
`3200`	`3200`	`// as a constant`
`3201`	`3201`	`self.with_constant_rib(\|\| {`
`3202`		`- self.resolve_expr(*dis_expr, visitor);`
	`3202`	`+ self.resolve_expr(*dis_expr, visitor);`
`3203`	`3203`	`});`
`3204`	`3204`	`}`
`3205`	`3205`	`}`
`@@ -3215,7 +3215,7 @@ impl Resolver {`
`3215`	`3215`	`visit_item(item, (), visitor);`
`3216`	`3216`	`}`
`3217`	`3217`	`}`
`3218`		`-`
	`3218`	`+`
`3219`	`3219`	`item_ty(_, type_parameters) => {`
`3220`	`3220`	`do self.with_type_parameter_rib`
`3221`	`3221`	`(HasTypeParameters(&type_parameters, item.id, 0u,`