Rename meet_and_join_new -> meet_and_join

Author: bclement-ocp

middle_end/flambda2/types/flambda2_types.ml

@@ -18,18 +18,18 @@ module Typing_env = struct
   include Typing_env
 
   let add_equation t name ty =
-    add_equation t name ty ~meet_type:Meet_and_join_new.meet_type
+    add_equation t name ty ~meet_type:Meet_and_join.meet_type
 
   let add_equations_on_params t ~params ~param_types =
     add_equations_on_params t ~params ~param_types
-      ~meet_type:Meet_and_join_new.meet_type
+      ~meet_type:Meet_and_join.meet_type
 
   let add_env_extension t extension =
-    add_env_extension t extension ~meet_type:Meet_and_join_new.meet_type
+    add_env_extension t extension ~meet_type:Meet_and_join.meet_type
 
   let add_env_extension_with_extra_variables t extension =
     add_env_extension_with_extra_variables t extension
-      ~meet_type:Meet_and_join_new.meet_type
+      ~meet_type:Meet_and_join.meet_type
 
   module Alias_set = Aliases.Alias_set
 end
@@ -43,7 +43,7 @@ type typing_env_extension = Typing_env_extension.t
 include Type_grammar
 include More_type_creators
 include Expand_head
-include Meet_and_join_new
+include Meet_and_join
 include Provers
 include Reify
 include Join_levels

middle_end/flambda2/types/join_levels.ml

@@ -86,7 +86,7 @@ let join_types ~env_at_fork envs_with_levels =
            could do better. *)
         TE.add_env_extension_maybe_bottom base_env
           (TEE.from_map joined_types)
-          ~meet_type:Meet_and_join_new.meet_type
+          ~meet_type:Meet_and_join.meet_type
       in
       let join_types name joined_ty use_ty =
         let same_unit =
@@ -143,7 +143,7 @@ let join_types ~env_at_fork envs_with_levels =
             Join_env.create base_env ~left_env ~right_env:env_at_use
           in
           match
-            Meet_and_join_new.join ~bound_name:name join_env joined_ty use_ty
+            Meet_and_join.join ~bound_name:name join_env joined_ty use_ty
           with
           | Known joined_ty -> Some joined_ty
           | Unknown -> None
@@ -332,7 +332,7 @@ let cut_and_n_way_join definition_typing_env ts_and_use_ids ~params ~cut_after
   in
   let result_env =
     TE.add_env_extension_from_level definition_typing_env level
-      ~meet_type:Meet_and_join_new.meet_type
+      ~meet_type:Meet_and_join.meet_type
   in
   TE.compute_joined_aliases result_env alias_candidates
     (List.map (fun (env_at_use, _, _, _) -> env_at_use) after_cuts)