---

Manishearth · Manishearth · commit 9c2d518460ba · 2015-03-13T19:51:09.000+05:30
yaml --- r: 190237 b: refs/heads/tmp c: 825f49a h: refs/heads/master i: 190235: 6151cfd v: v3
diff --git a/[refs] b/[refs]
@@ -34,6 +34,6 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 0d37323fd3052ca893caa7ec7b1a7263a1cd0656
+refs/heads/tmp: 825f49a89ab27e6c394cd9a7a7c59097baa8ea33
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf
diff --git a/branches/tmp/src/librustc/middle/pat_util.rs b/branches/tmp/src/librustc/middle/pat_util.rs
@@ -165,7 +165,7 @@ pub fn necessary_variants(dm: &DefMap, pat: &ast::Pat) -> Vec<ast::NodeId> {
             ast::PatIdent(_, _, None) |
             ast::PatStruct(..) => {
                 match dm.borrow().get(&p.id) {
-                    Some(&DefVariant(_, id, _)) => {
+                    Some(&PathResolution {base_def: DefVariant(_, id, _), ..}) => {
                         variants.push(id.node);
                     }
                     _ => ()

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ pub fn necessary_variants(dm: &DefMap, pat: &ast::Pat) -> Vec<ast::NodeId> {`
`165`	`165`	`ast::PatIdent(_, _, None) \|`
`166`	`166`	`ast::PatStruct(..) => {`
`167`	`167`	`match dm.borrow().get(&p.id) {`
`168`		`- Some(&DefVariant(_, id, _)) => {`
	`168`	`+ Some(&PathResolution {base_def: DefVariant(_, id, _), ..}) => {`
`169`	`169`	`variants.push(id.node);`
`170`	`170`	`}`
`171`	`171`	`_ => ()`