Remaining typing mli conflicts

typing/includecore.mli

@@ -46,18 +46,15 @@ type privacy_mismatch =
   | Private_extensible_variant
   | Private_row_type
 
-<<<<<<< HEAD
 type locality_mismatch = { order : position }
-||||||| merged common ancestors
-=======
+
 type type_kind =
   | Kind_abstract
   | Kind_record
   | Kind_variant
   | Kind_open
 
 type kind_mismatch = type_kind * type_kind
->>>>>>> ocaml/5.1
 
 type label_mismatch =
   | Type of Errortrace.equality_error

typing/includemod.mli

@@ -95,13 +95,8 @@ module Error: sig
     env: Env.t;
     missings: Types.signature_item list;
     incompatibles: (Ident.t * sigitem_symptom) list;
-<<<<<<< HEAD
-||||||| merged common ancestors
-    oks: (int * Typedtree.module_coercion) list;
-=======
     oks: (int * Typedtree.module_coercion) list;
     leftovers: ((Types.signature_item as 'it) * 'it * int) list
->>>>>>> ocaml/5.1
     (** signature items that could not be compared due to type divergence *)
   }
   and sigitem_symptom =

typing/persistent_env.mli

@@ -21,26 +21,15 @@ module Consistbl : module type of struct
 end
 
 type error =
-<<<<<<< HEAD
   | Illegal_renaming of Compilation_unit.Name.t * Compilation_unit.Name.t * filepath
   | Inconsistent_import of Compilation_unit.Name.t * filepath * filepath
   | Need_recursive_types of Compilation_unit.t
-  | Depend_on_unsafe_string_unit of Compilation_unit.t
   | Inconsistent_package_declaration of Compilation_unit.t * filepath
   | Inconsistent_package_declaration_between_imports of
       filepath * Compilation_unit.t * Compilation_unit.t
   | Direct_reference_from_wrong_package of
       Compilation_unit.t * filepath * Compilation_unit.Prefix.t
-||||||| merged common ancestors
-  | Illegal_renaming of modname * modname * filepath
-  | Inconsistent_import of modname * filepath * filepath
-  | Need_recursive_types of modname
-  | Depend_on_unsafe_string_unit of modname
-=======
-  | Illegal_renaming of modname * modname * filepath
-  | Inconsistent_import of modname * filepath * filepath
-  | Need_recursive_types of modname
->>>>>>> ocaml/5.1
+
 
 exception Error of error
 

typing/tast_iterator.mli

@@ -39,12 +39,10 @@ type iterator =
     env: iterator -> Env.t -> unit;
     expr: iterator -> expression -> unit;
     extension_constructor: iterator -> extension_constructor -> unit;
-<<<<<<< HEAD
     jkind_annotation: iterator -> const_jkind -> unit;
-||||||| merged common ancestors
-=======
     location: iterator -> Location.t -> unit;
->>>>>>> ocaml/5.1
+    (* CR ccasinghino: remember to check that any new forms we've added have
+       locations iterated over now that there is a iterator for it. *)
     module_binding: iterator -> module_binding -> unit;
     module_coercion: iterator -> module_coercion -> unit;
     module_declaration: iterator -> module_declaration -> unit;

typing/tast_mapper.mli

@@ -39,12 +39,10 @@ type mapper =
     expr: mapper -> expression -> expression;
     extension_constructor: mapper -> extension_constructor ->
       extension_constructor;
-<<<<<<< HEAD
     jkind_annotation: mapper -> const_jkind -> const_jkind;
-||||||| merged common ancestors
-=======
     location: mapper -> Location.t -> Location.t;
->>>>>>> ocaml/5.1
+    (* CR ccasinghino: remember to check that any new forms we've added have
+       locations mapped over now that there is a mapper for it. *)
     module_binding: mapper -> module_binding -> module_binding;
     module_coercion: mapper -> module_coercion -> module_coercion;
     module_declaration: mapper -> module_declaration -> module_declaration;

typing/typedecl.mli

@@ -63,16 +63,13 @@ 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
-||||||| merged common ancestors
-=======
+
 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
->>>>>>> ocaml/5.1
 
 type error =
     Repeated_parameter

typing/typemod.mli

@@ -35,14 +35,7 @@ val type_structure:
   Typedtree.structure * Types.signature * Signature_names.t * Shape.t *
   Env.t
 val type_toplevel_phrase:
-<<<<<<< HEAD
   Env.t -> Types.signature -> Parsetree.structure ->
-||||||| merged common ancestors
-  Env.t -> Parsetree.structure ->
-  Typedtree.structure * Types.signature * Signature_names.t * Env.t
-=======
-  Env.t -> Parsetree.structure ->
->>>>>>> ocaml/5.1
   Typedtree.structure * Types.signature * Signature_names.t * Shape.t *
   Env.t
 val type_implementation: