From 41fb042def23e93742357238e0ea4fd2c6ec0f19 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Mon, 29 Aug 2011 17:35:24 -0700
Subject: [PATCH] Stab-in-the-dark error fix for the crashing windows
 tinderboxes. Helps win2 anyways.

---
 src/comp/middle/resolve.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs
index c23d1f375d82..681a5352489c 100644
--- a/src/comp/middle/resolve.rs
+++ b/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 }
+                }
             }
           }
         }