Respond to pr feedback

Author: liam923

src/analysis/completion.ml

@@ -591,9 +591,9 @@ let complete_prefix ?get_doc ?target_type ?(kinds = []) ~keywords ~prefix
       match (is_label : is_label) with
       | No -> []
       | Maybe ->
-        Env.fold_labels Legacy add_label_description prefix_path env []
-        @ Env.fold_labels Unboxed_product add_label_description prefix_path env
-            []
+        Env.fold_all_labels
+          { fold_all_labels_f = (fun _ -> add_label_description) }
+          prefix_path env []
       | Description lbls ->
         List.fold_right ~f:add_label_description lbls ~init:[]
       | Declaration (ty, decls) ->

src/analysis/env_lookup.ml

@@ -137,12 +137,8 @@ let by_longident (nss : Namespace.inferred list) ident env =
             raise (Found (path, Label, lbl.lbl_uid, loc))
           | `Labels ->
             log ~title:"lookup" "lookup in label namespace";
-            let module Pack = struct
-              (* This gadt is used to mint the existential type [rep] *)
-              type t = P : 'rep Types.gen_label_description -> t
-            end in
-            let (P (type rep) (lbl : rep Types.gen_label_description)) : Pack.t
-                =
+            let (P (type rep) (lbl : rep Types.gen_label_description)) :
+                Namespace.packed_label_description =
               (* Try looking up in boxed namespace, and then fallback to unboxed if that
                  fails *)
               try P (Env.find_label_by_name Legacy ident env)

src/ocaml/typing/env.ml

@@ -4980,3 +4980,12 @@ let cleanup_usage_tables ~stamp =
   Stamped_hashtable.backtrack used_constructors_changelog ~stamp;
   Stamped_hashtable.backtrack used_labels_changelog ~stamp;
   Stamped_hashtable.backtrack used_unboxed_labels_changelog ~stamp
+
+type 'acc fold_all_labels_f =
+  {
+    fold_all_labels_f : 'rcd. 'rcd record_form -> 'rcd gen_label_description -> 'acc -> 'acc
+  }
+
+let fold_all_labels f ident env init =
+  let acc_after_legacy = fold_labels Legacy (f.fold_all_labels_f Legacy) ident env init in
+  fold_labels Unboxed_product (f.fold_all_labels_f Unboxed_product) ident env acc_after_legacy

src/ocaml/typing/env.mli

@@ -688,3 +688,8 @@ val cleanup_usage_tables : stamp:int -> unit
 (** This value should be filled in with [Msupport.raise_error]. [Env] cannot use this
     function directly because [Msupport] depends on [Env] *)
 val msupport_raise_error : (?ignore_unify:bool -> exn -> unit) ref
+
+type 'acc fold_all_labels_f = {
+  fold_all_labels_f : 'rcd. 'rcd record_form -> 'rcd gen_label_description -> 'acc -> 'acc
+}
+val fold_all_labels: 'a fold_all_labels_f -> Longident.t option -> t -> 'a -> 'a