clean up

Author: mununki

jscomp/frontend/bs_builtin_ppx.ml

@@ -573,39 +573,36 @@ let rec structure_mapper ~await_context (self : mapper) (stru : Ast_structure.t)
       :: structure_mapper ~await_context self rest
     | Pstr_value (_, vbs) ->
       let item = self.structure_item self item in
-      let module_exprs =
+      (* [ module __Belt_List__ = module type of Belt.List ] *)
+      let module_type_decls =
         vbs
         |> List.filter_map (fun ({pvb_expr} : Parsetree.value_binding) ->
                match pvb_expr.pexp_desc with
                | Pexp_letmodule (_, ({pmod_attributes} as me), _)
-                 when Res_parsetree_viewer.hasAwaitAttribute pmod_attributes ->
-                 Some me
-               | _ -> None)
-      in
-      (* [ module __Belt_List__ = module type of Belt.List ] *)
-      let module_type_decls =
-        module_exprs
-        |> List.filter_map (fun ({pmod_desc} as me : Parsetree.module_expr) ->
-               match pmod_desc with
-               | Pmod_ident {txt; loc} -> (
-                 let safe_module_type_name = local_module_type_name txt in
-                 let has_local_module_name =
-                   Hashtbl.find_opt !await_context safe_module_type_name
-                 in
+                 when Res_parsetree_viewer.hasAwaitAttribute pmod_attributes
+                 -> (
+                 match me.pmod_desc with
+                 | Pmod_ident {txt; loc} -> (
+                   let safe_module_type_name = local_module_type_name txt in
+                   let has_local_module_name =
+                     Hashtbl.find_opt !await_context safe_module_type_name
+                   in
 
-                 match has_local_module_name with
-                 | Some _ -> None
-                 | None ->
-                   Hashtbl.add !await_context safe_module_type_name
-                     safe_module_type_name;
-                   Some
-                     Ast_helper.(
-                       Str.modtype ~loc
-                         (Mtd.mk ~loc
-                            {txt = safe_module_type_name; loc}
-                            ~typ:(Mty.typeof_ ~loc me))))
+                   match has_local_module_name with
+                   | Some _ -> None
+                   | None ->
+                     Hashtbl.add !await_context safe_module_type_name
+                       safe_module_type_name;
+                     Some
+                       Ast_helper.(
+                         Str.modtype ~loc
+                           (Mtd.mk ~loc
+                              {txt = safe_module_type_name; loc}
+                              ~typ:(Mty.typeof_ ~loc me))))
+                 | _ -> None)
                | _ -> None)
       in
+
       module_type_decls @ (item :: structure_mapper ~await_context self rest)
     | _ ->
       self.structure_item self item :: structure_mapper ~await_context self rest