Remove -infer-with-bounds flag, defaulting to true (#3657)

It now looks like performance of with-bounds is satisfactory to release enabled
by default, so let's just remove this flag entirely to clean things up.

Author: glittershark

driver/main_args.ml

@@ -759,10 +759,6 @@ in
   \    allows a set of extensions, and every successive universe includes \n\
   \    the previous one."
 
-let mk_infer_with_bounds f =
-  "-infer-with-bounds", Arg.Unit f,
-  "Infer with-bounds on kinds for type declarations. May impact performance."
-
 let mk_dump_dir f =
   "-dump-dir", Arg.String f,
   "redirects any file(s) that would be outputted as a result of other flags\n\
@@ -957,7 +953,6 @@ module type Common_options = sig
   val _extension : string -> unit
   val _no_extension : string -> unit
   val _extension_universe : string -> unit
-  val _infer_with_bounds : unit -> unit
   val _noassert : unit -> unit
   val _nolabels : unit -> unit
   val _nostdlib : unit -> unit
@@ -1245,7 +1240,6 @@ struct
     mk_extension F._extension;
     mk_no_extension F._no_extension;
     mk_extension_universe F._extension_universe;
-    mk_infer_with_bounds F._infer_with_bounds;
     mk_for_pack_byt F._for_pack;
     mk_g_byt F._g;
     mk_no_g F._no_g;
@@ -1377,7 +1371,6 @@ struct
     mk_extension F._extension;
     mk_no_extension F._no_extension;
     mk_extension_universe F._extension_universe;
-    mk_infer_with_bounds F._infer_with_bounds;
     mk_noassert F._noassert;
     mk_noinit F._noinit;
     mk_nolabels F._nolabels;
@@ -1472,7 +1465,6 @@ struct
     mk_extension F._extension;
     mk_no_extension F._no_extension;
     mk_extension_universe F._extension_universe;
-    mk_infer_with_bounds F._infer_with_bounds;
     mk_for_pack_opt F._for_pack;
     mk_g_opt F._g;
     mk_no_g F._no_g;
@@ -1664,7 +1656,6 @@ module Make_opttop_options (F : Opttop_options) = struct
     mk_extension F._extension;
     mk_no_extension F._no_extension;
     mk_extension_universe F._extension_universe;
-    mk_infer_with_bounds F._infer_with_bounds;
     mk_no_float_const_prop F._no_float_const_prop;
     mk_noassert F._noassert;
     mk_noinit F._noinit;
@@ -1772,7 +1763,6 @@ struct
     mk_extension F._extension;
     mk_no_extension F._no_extension;
     mk_extension_universe F._extension_universe;
-    mk_infer_with_bounds F._infer_with_bounds;
     mk_noassert F._noassert;
     mk_nolabels F._nolabels;
     mk_nostdlib F._nostdlib;
@@ -1884,7 +1874,6 @@ module Default = struct
     let _no_extension s = Language_extension.(disable_of_string_exn s)
     let _extension_universe s =
       Language_extension.(set_universe_and_enable_all_of_string_exn s)
-    let _infer_with_bounds = set Clflags.infer_with_bounds
     let _noassert = set noassert
     let _nolabels = set classic
     let _nostdlib = set no_std_include

driver/main_args.mli

@@ -34,7 +34,6 @@ module type Common_options = sig
   val _extension : string -> unit
   val _no_extension : string -> unit
   val _extension_universe : string -> unit
-  val _infer_with_bounds : unit -> unit
   val _noassert : unit -> unit
   val _nolabels : unit -> unit
   val _nostdlib : unit -> unit

stdlib/dune

@@ -26,8 +26,7 @@
    -bin-annot
    -nostdlib
    -safe-string
-   -strict-formats
-   -infer-with-bounds))
+   -strict-formats))
  (ocamlopt_flags
   (:include %{project_root}/ocamlopt_flags.sexp))
  (preprocess

testsuite/tests/typing-immediate/immediate.ml

@@ -160,7 +160,7 @@ end;;
 Line 2, characters 2-41:
 2 |   type t = Foo of int | Bar [@@immediate]
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is value
+Error: The kind of type "t" is immutable_data
          because it's a boxed variant type.
        But the kind of type "t" must be a subkind of immediate
          because of the annotation on the declaration of the type t.
@@ -174,7 +174,7 @@ end;;
 Line 2, characters 2-38:
 2 |   type t = { foo : int } [@@immediate]
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Error: The kind of type "t" is value
+Error: The kind of type "t" is immutable_data
          because it's a boxed record type.
        But the kind of type "t" must be a subkind of immediate
          because of the annotation on the declaration of the type t.

testsuite/tests/typing-jkind-bounds/annots.ml

@@ -1,10 +1,9 @@
 (* TEST
  include stdlib_upstream_compatible;
- flags = "-infer-with-bounds";
  {
    expect;
  }{
-   flags += " -extension layouts_beta";
+   flags = " -extension layouts_beta";
    expect;
  }
 *)

testsuite/tests/typing-jkind-bounds/basics.ml

@@ -1,5 +1,5 @@
 (* TEST
- flags = "-infer-with-bounds -extension small_numbers";
+ flags = "-extension small_numbers";
  expect;
 *)
 

testsuite/tests/typing-jkind-bounds/composite.ml

@@ -1,5 +1,4 @@
 (* TEST
-    flags = "-infer-with-bounds";
     expect;
 *)
 

testsuite/tests/typing-jkind-bounds/gadt.ml

@@ -1,5 +1,4 @@
 (* TEST
-    flags = "-infer-with-bounds";
     expect;
 *)
 

testsuite/tests/typing-jkind-bounds/modalities.ml

@@ -1,5 +1,5 @@
 (* TEST
-    flags = "-extension layouts_alpha -infer-with-bounds";
+    flags = "-extension layouts_alpha";
     expect;
 *)
 let use_uncontended : 'a @ uncontended -> unit = fun _ -> ()