concrete_default -> concrete_legacy

Author: d-kalinichenko

ocaml/typing/ctype.ml

@@ -2278,8 +2278,8 @@ let type_sort ~why env ty =
   | Ok _ -> Ok sort
   | Error _ as e -> e
 
-let type_non_null_sort ~why env ty =
-  let jkind, sort = Jkind.of_new_default_sort_var ~why in
+let type_legacy_sort ~why env ty =
+  let jkind, sort = Jkind.of_new_legacy_sort_var ~why in
   match constrain_type_jkind env ty jkind with
   | Ok _ -> Ok sort
   | Error _ as e -> e

ocaml/typing/ctype.mli

@@ -558,8 +558,8 @@ val type_sort :
 
 (* As [type_sort], but constrain the jkind to be non-null.
    Used for checking array elements. *)
-val type_non_null_sort :
-  why:Jkind.History.concrete_default_creation_reason ->
+val type_legacy_sort :
+  why:Jkind.History.concrete_legacy_creation_reason ->
   Env.t -> type_expr -> (Jkind.sort, Jkind.Violation.t) result
 
 (* Jkind checking. [constrain_type_jkind] will update the jkind of type

ocaml/typing/jkind.ml

@@ -1131,11 +1131,11 @@ let of_new_sort_var ~why =
 
 let of_new_sort ~why = fst (of_new_sort_var ~why)
 
-let of_new_default_sort_var ~why =
+let of_new_legacy_sort_var ~why =
   let jkind, sort = Jkind_desc.of_new_sort_var Non_null in
-  fresh_jkind jkind ~why:(Concrete_default_creation why), sort
+  fresh_jkind jkind ~why:(Concrete_legacy_creation why), sort
 
-let of_new_default_sort ~why = fst (of_new_default_sort_var ~why)
+let of_new_legacy_sort ~why = fst (of_new_legacy_sort_var ~why)
 
 (* CR layouts v2.8: remove this function *)
 let of_const ~why
@@ -1392,8 +1392,8 @@ module Format_history = struct
          ([@@layout_poly] forces all variables of layout 'any' to be@ \
          representable at call sites)"
 
-  let format_concrete_default_creation_reason ppf :
-      History.concrete_default_creation_reason -> unit = function
+  let format_concrete_legacy_creation_reason ppf :
+      History.concrete_legacy_creation_reason -> unit = function
     | Unannotated_type_parameter path ->
       fprintf ppf "it instantiates an unannotated type parameter of %a"
         !printtyp_path path
@@ -1581,8 +1581,8 @@ module Format_history = struct
     | Bits32_creation bits32 -> format_bits32_creation_reason ppf bits32
     | Bits64_creation bits64 -> format_bits64_creation_reason ppf bits64
     | Concrete_creation concrete -> format_concrete_creation_reason ppf concrete
-    | Concrete_default_creation concrete ->
-      format_concrete_default_creation_reason ppf concrete
+    | Concrete_legacy_creation concrete ->
+      format_concrete_legacy_creation_reason ppf concrete
     | Imported ->
       fprintf ppf "of %s requirements from an imported definition"
         layout_or_kind
@@ -1617,7 +1617,7 @@ module Format_history = struct
     | Creation reason -> (
       fprintf ppf "@ because %a" (format_creation_reason ~layout_or_kind) reason;
       match reason, jkind_desc with
-      | Concrete_default_creation _, Const _ ->
+      | Concrete_legacy_creation _, Const _ ->
         fprintf ppf ",@ defaulted to %s %a" layout_or_kind Desc.format
           jkind_desc
       | _ -> ())
@@ -1798,7 +1798,7 @@ let score_reason = function
   (* error_message annotated by the user should always take priority *)
   | Creation (Annotated (With_error_message _, _)) -> 1
   (* Concrete creation is quite vague, prefer more specific reasons *)
-  | Creation (Concrete_creation _ | Concrete_default_creation _) -> -1
+  | Creation (Concrete_creation _ | Concrete_legacy_creation _) -> -1
   | _ -> 0
 
 let combine_histories reason lhs rhs =
@@ -1885,8 +1885,8 @@ module Debug_printers = struct
     | Optional_arg_default -> fprintf ppf "Optional_arg_default"
     | Layout_poly_in_external -> fprintf ppf "Layout_poly_in_external"
 
-  let concrete_default_creation_reason ppf :
-      History.concrete_default_creation_reason -> unit = function
+  let concrete_legacy_creation_reason ppf :
+      History.concrete_legacy_creation_reason -> unit = function
     | Unannotated_type_parameter path ->
       fprintf ppf "Unannotated_type_parameter %a" !printtyp_path path
     | Wildcard -> fprintf ppf "Wildcard"
@@ -2026,9 +2026,9 @@ module Debug_printers = struct
       fprintf ppf "Bits64_creation %a" bits64_creation_reason bits64
     | Concrete_creation concrete ->
       fprintf ppf "Concrete_creation %a" concrete_creation_reason concrete
-    | Concrete_default_creation concrete ->
-      fprintf ppf "Concrete_default_creation %a"
-        concrete_default_creation_reason concrete
+    | Concrete_legacy_creation concrete ->
+      fprintf ppf "Concrete_legacy_creation %a" concrete_legacy_creation_reason
+        concrete
     | Imported -> fprintf ppf "Imported"
     | Imported_type_argument { parent_path; position; arity } ->
       fprintf ppf "Imported_type_argument (pos %d, arity %d) of %a" position

ocaml/typing/jkind.mli

@@ -311,14 +311,16 @@ val of_new_sort_var : why:History.concrete_creation_reason -> t * sort
 (** Create a fresh sort variable, packed into a jkind. *)
 val of_new_sort : why:History.concrete_creation_reason -> t
 
-(** Same as [of_new_sort_var], but the jkind is lowered to [Non_null].
+(** Same as [of_new_sort_var], but the jkind is lowered to [Non_null]
+    to mirror "legacy" OCaml values.
     Defaulting the sort variable produces exactly [value].  *)
-val of_new_default_sort_var :
-  why:History.concrete_default_creation_reason -> t * sort
+val of_new_legacy_sort_var :
+  why:History.concrete_legacy_creation_reason -> t * sort
 
-(** Same as [of_new_sort], but the jkind is lowered to [Non_null].
+(** Same as [of_new_sort], but the jkind is lowered to [Non_null]
+    to mirror "legacy" OCaml values.
     Defaulting the sort variable produces exactly [value].  *)
-val of_new_default_sort : why:History.concrete_default_creation_reason -> t
+val of_new_legacy_sort : why:History.concrete_legacy_creation_reason -> t
 
 val of_const : why:History.creation_reason -> Const.t -> t
 

ocaml/typing/jkind_intf.ml

@@ -165,11 +165,11 @@ module History = struct
     | Optional_arg_default
     | Layout_poly_in_external
 
-  (* For sort variables that are in the "default" position
+  (* For sort variables that are in the "legacy" position
      on the jkind lattice, defaulting exactly to [value]. *)
   (* CR layouts v3: after implementing separability, [Array_element]
      should instead accept representable separable jkinds. *)
-  type concrete_default_creation_reason =
+  type concrete_legacy_creation_reason =
     | Unannotated_type_parameter of Path.t
     | Wildcard
     | Unification_var
@@ -284,7 +284,7 @@ module History = struct
     | Bits32_creation of bits32_creation_reason
     | Bits64_creation of bits64_creation_reason
     | Concrete_creation of concrete_creation_reason
-    | Concrete_default_creation of concrete_default_creation_reason
+    | Concrete_legacy_creation of concrete_legacy_creation_reason
     | Imported
     | Imported_type_argument of
         { parent_path : Path.t;

ocaml/typing/typecore.ml

@@ -1622,7 +1622,7 @@ let solve_Ppat_array ~refine loc env mutability expected_ty =
     if Types.is_mutable mutability then Predef.type_array
     else Predef.type_iarray
   in
-  let jkind, arg_sort = Jkind.of_new_default_sort_var ~why:Array_element in
+  let jkind, arg_sort = Jkind.of_new_legacy_sort_var ~why:Array_element in
   let ty_elt = newgenvar jkind in
   let expected_ty = generic_instance expected_ty in
   unify_pat_types ~refine
@@ -8753,7 +8753,7 @@ and type_generic_array
   in
   check_construct_mutability ~loc ~env mutability argument_mode;
   let argument_mode = mode_modality modalities argument_mode in
-  let jkind, elt_sort = Jkind.of_new_default_sort_var ~why:Array_element in
+  let jkind, elt_sort = Jkind.of_new_legacy_sort_var ~why:Array_element in
   let ty = newgenvar jkind in
   let to_unify = type_ ty in
   with_explanation explanation (fun () ->

ocaml/typing/typeopt.ml

@@ -99,15 +99,15 @@ let maybe_pointer_type env ty =
 
 let maybe_pointer exp = maybe_pointer_type exp.exp_env exp.exp_type
 
-(* CR layouts v2.8: Calling [type_non_null_sort] in [typeopt] is not ideal
+(* CR layouts v2.8: Calling [type_legacy_sort] in [typeopt] is not ideal
    and this function should be removed at some point. To do that, there
    needs to be a way to store sort vars on [Tconstr]s. That means
    either introducing a [Tpoly_constr], allow type parameters with
    sort info, or do something else. *)
 (* CR layouts v3.0: have a better error message
    for nullable jkinds.*)
-let type_non_null_sort ~why env loc ty =
-  match Ctype.type_non_null_sort ~why env ty with
+let type_legacy_sort ~why env loc ty =
+  match Ctype.type_legacy_sort ~why env ty with
   | Ok sort -> sort
   | Error err -> raise (Error (loc, Not_a_sort (ty, err)))
 
@@ -174,7 +174,7 @@ let array_type_kind ~elt_sort env loc ty =
         match elt_sort with
         | Some s -> s
         | None ->
-          type_non_null_sort ~why:Array_element env loc elt_ty
+          type_legacy_sort ~why:Array_element env loc elt_ty
       in
       begin match classify env loc elt_ty elt_sort with
       | Any -> if Config.flat_float_array then Pgenarray else Paddrarray

ocaml/typing/typetexp.ml

@@ -435,7 +435,7 @@ end = struct
        preserve backwards compatibility. But we also need [Any] callsites
        to accept nullable jkinds to allow cases like [type ('a : value_or_null) t = 'a]. *)
     | Any -> Jkind.Primitive.any ~why:(if is_named then Unification_var else Wildcard)
-    | Sort -> Jkind.of_new_default_sort ~why:(if is_named then Unification_var else Wildcard)
+    | Sort -> Jkind.of_new_legacy_sort ~why:(if is_named then Unification_var else Wildcard)
 
   let new_any_var loc env jkind = function
     | { extensibility = Fixed } -> raise(Error(loc, env, No_type_wildcards))
@@ -541,7 +541,7 @@ let transl_type_param env path styp =
    to ask for it with an annotation.  Some restriction here seems necessary
    for backwards compatibility (e.g., we wouldn't want [type 'a id = 'a] to
    have jkind any).  But it might be possible to infer [any] in some cases. *)
-  let jkind = Jkind.of_new_default_sort ~why:(Unannotated_type_parameter path) in
+  let jkind = Jkind.of_new_legacy_sort ~why:(Unannotated_type_parameter path) in
   let attrs = styp.ptyp_attributes in
   match styp.ptyp_desc with
     Ptyp_any -> transl_type_param_var env loc attrs None jkind None
@@ -557,7 +557,7 @@ let transl_type_param env path styp =
 
 let get_type_param_jkind path styp =
   match Jane_syntax.Core_type.of_ast styp with
-  | None -> Jkind.of_new_default_sort ~why:(Unannotated_type_parameter path)
+  | None -> Jkind.of_new_legacy_sort ~why:(Unannotated_type_parameter path)
   | Some (Jtyp_layout (Ltyp_var { name; jkind }), _attrs) ->
     let jkind, _ =
       Jkind.of_annotation