Resolve all mlis

src/ocaml/typing/tast_iterator.mli

@@ -39,12 +39,8 @@ type iterator =
     env: iterator -> Env.t -> unit;
     expr: iterator -> expression -> unit;
     extension_constructor: iterator -> extension_constructor -> unit;
-<<<<<<< HEAD
     jkind_annotation: iterator -> const_jkind -> unit;
-||||||| b01e78e20
-=======
     location: iterator -> Location.t -> unit;
->>>>>>> ups/501
     module_binding: iterator -> module_binding -> unit;
     module_coercion: iterator -> module_coercion -> unit;
     module_declaration: iterator -> module_declaration -> unit;

src/ocaml/typing/tast_mapper.mli

@@ -39,12 +39,8 @@ type mapper =
     expr: mapper -> expression -> expression;
     extension_constructor: mapper -> extension_constructor ->
       extension_constructor;
-<<<<<<< HEAD
     jkind_annotation: mapper -> const_jkind -> const_jkind;
-||||||| b01e78e20
-=======
     location: mapper -> Location.t -> Location.t;
->>>>>>> ups/501
     module_binding: mapper -> module_binding -> module_binding;
     module_coercion: mapper -> module_coercion -> module_coercion;
     module_declaration: mapper -> module_declaration -> module_declaration;

src/ocaml/typing/typedecl.mli

@@ -63,18 +63,14 @@ val is_fixed_type : Parsetree.type_declaration -> bool
 
 type native_repr_kind = Unboxed | Untagged
 
-<<<<<<< HEAD
 (* Records reason for a jkind representability requirement in errors. *)
 type jkind_sort_loc = Cstr_tuple | Record | External
 
-||||||| b01e78e20
-=======
 type reaching_type_path = reaching_type_step list
 and reaching_type_step =
   | Expands_to of type_expr * type_expr
   | Contains of type_expr * type_expr
 
->>>>>>> ups/501
 type error =
     Repeated_parameter
   | Duplicate_constructor of string

src/ocaml/typing/typedtree.mli

@@ -83,14 +83,8 @@ and pat_extra =
   | Tpat_unpack
         (** (module P)     { pat_desc  = Tpat_var "P"
                            ; pat_extra = (Tpat_unpack, _, _) :: ... }
-<<<<<<< HEAD
-            (module _)     { pat_desc  = Tpat_any
-                           ; pat_extra = (Tpat_unpack, _, _) :: ... }
-||||||| b01e78e20
-=======
             (module _)     { pat_desc  = Tpat_any
             ; pat_extra = (Tpat_unpack, _, _) :: ... }
->>>>>>> ups/501
          *)
 
 and 'k pattern_desc =
@@ -434,13 +428,7 @@ and 'k case =
     }
 
 and record_label_definition =
-<<<<<<< HEAD
-  | Kept of Types.type_expr * unique_use
-||||||| b01e78e20
-  | Kept of Types.type_expr
-=======
-  | Kept of Types.type_expr * mutable_flag
->>>>>>> ups/501
+  | Kept of Types.type_expr * unique_use * mutable_flag
   | Overridden of Longident.t loc * expression
 
 and binding_op =

src/ocaml/typing/types.mli

@@ -505,26 +505,9 @@ and ('lbl, 'cstr) type_kind =
   | Type_variant of 'cstr list * variant_representation
   | Type_open
 
-<<<<<<< HEAD
 (* CR layouts: after removing the void translation from lambda, we could get rid of
    this src_index / runtime_tag distinction.  But I am leaving it in because it
    may not be long before we need it again.
-||||||| b01e78e20
-and record_representation =
-    Record_regular                      (* All fields are boxed / tagged *)
-  | Record_float                        (* All fields are floats *)
-  | Record_unboxed of bool    (* Unboxed single-field record, inlined or not *)
-  | Record_inlined of int               (* Inlined record *)
-  | Record_extension of Path.t          (* Inlined record under extension *)
-=======
-and record_representation =
-    Record_regular                      (* All fields are boxed / tagged *)
-  | Record_float                        (* All fields are floats *)
-  | Record_unboxed of bool    (* Unboxed single-field record, inlined or not *)
-  | Record_inlined of int               (* Inlined record *)
-  | Record_extension of Path.t          (* Inlined record under extension *)
-                             (* The argument is the path of the extension *)
->>>>>>> ups/501
 
    In particular, lambda will need to do something about computing offsets for
    block projections when not everything is one word wide, whether that's
@@ -536,6 +519,7 @@ and record_representation =
 and tag = Ordinary of {src_index: int;  (* Unique name (per type) *)
                        runtime_tag: int}    (* The runtime tag *)
         | Extension of Path.t * Jkind.t array
+                      (* The argument is the path of the extension *)
 
 and abstract_reason =
     Abstract_def

src/ocaml/typing/typetexp.mli

@@ -83,16 +83,8 @@ end
 val valid_tyvar_name : string -> bool
 
 val transl_simple_type:
-<<<<<<< HEAD
         Env.t -> ?univars:TyVarEnv.poly_univars -> closed:bool -> Alloc.Const.t
         -> Parsetree.core_type -> Typedtree.core_type
-||||||| b01e78e20
-        Env.t -> ?univars:poly_univars -> bool -> Parsetree.core_type
-        -> Typedtree.core_type
-=======
-        Env.t -> ?univars:TyVarEnv.poly_univars -> closed:bool
-        -> Parsetree.core_type -> Typedtree.core_type
->>>>>>> ups/501
 val transl_simple_type_univars:
         Env.t -> Parsetree.core_type -> Typedtree.core_type
 val transl_simple_type_delayed
@@ -109,19 +101,11 @@ val transl_type_param:
 (* the Path.t above is of the type/class whose param we are processing;
    the level defaults to the current level *)
 
-<<<<<<< HEAD
 val get_type_param_jkind: Path.t -> Parsetree.core_type -> jkind
 val get_type_param_name: Parsetree.core_type -> string option
 
 val get_alloc_mode : Parsetree.core_type -> Alloc.Const.t
 
-||||||| b01e78e20
-type variable_context
-val narrow: unit -> variable_context
-val widen: variable_context -> unit
-
-=======
->>>>>>> ups/501
 exception Already_bound
 
 type value_loc =