---

yaml
---
r: 5035
b: refs/heads/master
c: 41fb042
h: refs/heads/master
i:
  5033: 72823da
  5031: 364e497
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1ed03dfa5ae3460d64cb6032da790f04221a153
+refs/heads/master: 41fb042def23e93742357238e0ea4fd2c6ec0f19

trunk/src/comp/middle/resolve.rs

@@ -689,8 +689,10 @@ fn lookup_in_scope(e: &env, sc: scopes, sp: &span, name: &ident,
           }
           scope_arm(a) {
             if ns == ns_value {
-                ret option::map(ast::def_binding,
-                                lookup_in_pat(name, a.pats[0]));
+                alt lookup_in_pat(name, a.pats[0]) {
+                  some(did) { ret some(ast::def_binding(did)); }
+                  _ { ret none }
+                }
             }
           }
         }