Merge branch 'issue-139-2' of git.m-labs.hk:M-Labs/nac3 into issue-139-2

nac3artiq/src/symbol_resolver.rs

@@ -551,17 +551,18 @@ impl InnerResolver {
         let constructor_ty = pyid_to_def
             .get(&py_obj_id)
             .and_then(|def_id| {
-                defs.iter()
+                defs
-                    .find_map(|def| {
+                .iter()
-                        if let TopLevelDef::Class {
+                .find_map(|def| {
-                            object_id, methods, constructor, ..
+                    if let TopLevelDef::Class {
-                        } = &*def.read() {
+                        object_id, methods, constructor, ..
-                            if object_id == def_id && constructor.is_some() && methods.iter().any(|(s, _, _)| s == &"__init__".into()) {
+                    } = &*def.read() {
-                                return constructor.clone();
+                        if object_id == def_id && constructor.is_some() && methods.iter().any(|(s, _, _)| s == &"__init__".into()) {
-                            }
+                            return constructor.clone();
                         }
-                        None
+                    }
-                    })
+                    None
+                })
             });
 
         if let Some(ty) = constructor_ty {