---

Manishearth · Manishearth · commit 02f8a3d4fff3 · 2015-03-13T19:51:09.000+05:30
yaml --- r: 189997 b: refs/heads/master c: 825f49a h: refs/heads/master i: 189995: 91db5bb v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0d37323fd3052ca893caa7ec7b1a7263a1cd0656
+refs/heads/master: 825f49a89ab27e6c394cd9a7a7c59097baa8ea33
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 270a677d4d698916f5ad103f0afc3c070b8dbeb4
 refs/heads/try: 1c28ab65017d74fc13d003f7c7a73d1a48e5406f
diff --git a/trunk/src/librustc/middle/pat_util.rs b/trunk/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`	`_ => ()`