Promote tests

Author: mshinwell

tests/test-dirs/alerts.t/run.t

@@ -52,8 +52,6 @@
 The compiler accept both
   $ $OCAMLC -c main.ml
   File "main.ml", line 2, characters 8-12:
-  2 | let x = sqrt 3.
-              ^^^^
   Alert deprecated: Lib.sqrt
   I am deprecated
 

tests/test-dirs/document/unattached-comment.t

@@ -19,8 +19,6 @@ And that it also works outside of the current buffer:
 
   $ $OCAMLC -c -bin-annot -w +50 test.ml
   File "test.ml", line 1, characters 14-42:
-  1 | let foo x y = (** incorrect doc for foo *)
-                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   Warning 50 [unexpected-docstring]: unattached documentation comment (ignored)
 
   $ $MERLIN single document -position 1:18 -filename outside.ml << EOF

tests/test-dirs/function-recovery.t

@@ -10,7 +10,7 @@
     "value": "[
     structure_item (test.ml[1,0+0]..test.ml[3,104+28])
       Tstr_module
-      ERROR_locate_from_inside_function_literal_used_as_non_function/283
+      ERROR_locate_from_inside_function_literal_used_as_non_function/284
         module_expr (test.ml[1,0+72]..test.ml[3,104+28])
           Tmod_structure
           [
@@ -19,9 +19,9 @@
               [
                 <def>
                   pattern (test.ml[2,79+6]..test.ml[2,79+13])
-                    Tpat_var \"problem/281\"
+                    Tpat_var \"problem/282\"
                     sort value
-                    value_mode meet(local,once,nonportable,yielding,stateful)(modevar#4[global,many,portable,unyielding,stateless .. global,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#5[aliased,contended,immutable .. unique,uncontended,read_write])
+                    value_mode meet(local,once,nonportable,unforkable,yielding,stateful)(modevar#4[global,many,portable,forkable,unyielding,stateless .. global,once,nonportable,unforkable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#5[aliased,contended,immutable .. unique,uncontended,read_write])
                   expression (test.ml[2,79+16]..test.ml[2,79+24])
                     Texp_variant \"Problem\"
                     None
@@ -36,7 +36,7 @@
                     None
                   expression (test.ml[3,104+11]..test.ml[3,104+28])
                     Texp_function
-                    alloc_mode id(modevar#13[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);id(modevar#14[aliased,contended,immutable .. unique,uncontended,read_write])
+                    alloc_mode id(modevar#13[global,many,portable,forkable,unyielding,stateless .. local,once,nonportable,unforkable,yielding,stateful]);id(modevar#14[aliased,contended,immutable .. unique,uncontended,read_write])
                     []
                     Tfunction_body
                       expression (test.ml[3,104+11]..test.ml[3,104+28])
@@ -49,7 +49,7 @@
                               expression (_none_[0,0+-1]..[0,0+-1]) ghost
                                 Pexp_constant PConst_int (1,None)
                           ]
-                        Texp_ident \"*type-error*/282\"
+                        Texp_ident \"*type-error*/283\"
               ]
           ]
   ]
@@ -69,14 +69,14 @@
       [
         <def>
           pattern (type.ml[1,0+4]..type.ml[1,0+5])
-            Tpat_var \"f/281\"
+            Tpat_var \"f/282\"
             sort value
-            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#2[global,many,portable,unyielding,stateless .. global,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
+            value_mode meet(local,once,nonportable,unforkable,yielding,stateful)(modevar#2[global,many,portable,forkable,unyielding,stateless .. global,once,nonportable,unforkable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (type.ml[1,0+8]..type.ml[1,0+61])
             extra
               Texp_newtype  t
             Texp_function
-            alloc_mode map_comonadic(regional_to_global)(modevar#4[global,many,portable,unyielding,stateless .. global,once,nonportable,yielding,stateful]);id(modevar#5[aliased,contended,immutable .. unique,uncontended,read_write])
+            alloc_mode map_comonadic(regional_to_global)(modevar#4[global,many,portable,forkable,unyielding,stateless .. global,once,nonportable,unforkable,yielding,stateful]);id(modevar#5[aliased,contended,immutable .. unique,uncontended,read_write])
             [
               Nolabel
               Param_pat
@@ -87,12 +87,12 @@
                       Ttyp_constr \"list/11!\"
                       [
                         core_type (type.ml[1,0+28]..type.ml[1,0+29])
-                          Ttyp_constr \"t/283\"
+                          Ttyp_constr \"t/284\"
                           []
                       ]
-                  Tpat_var \"foo/284\"
+                  Tpat_var \"foo/285\"
                   sort value
-                  value_mode map_comonadic(local_to_regional)(modevar#6[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#7[aliased,contended,immutable .. unique,uncontended,read_write])
+                  value_mode map_comonadic(local_to_regional)(modevar#6[global,many,portable,forkable,unyielding,stateless .. local,once,nonportable,unforkable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#7[aliased,contended,immutable .. unique,uncontended,read_write])
             ]
             Tfunction_body
               expression (type.ml[1,0+39]..type.ml[1,0+61])
@@ -103,7 +103,7 @@
                       extra
                         Tpat_extra_constraint
                         core_type (type.ml[1,0+48]..type.ml[1,0+49])
-                          Ttyp_constr \"t/283\"
+                          Ttyp_constr \"t/284\"
                           []
                       Tpat_any
                     expression (type.ml[1,0+53]..type.ml[1,0+55])
@@ -116,7 +116,7 @@
                             expression (_none_[0,0+-1]..[0,0+-1]) ghost
                               Pexp_constant PConst_int (1,None)
                         ]
-                      Texp_ident \"*type-error*/285\"
+                      Texp_ident \"*type-error*/286\"
                 ]
                 expression (type.ml[1,0+59]..type.ml[1,0+61])
                   attribute \"merlin.loc\"
@@ -195,9 +195,9 @@
                     "ghost": false,
                     "attrs": [],
                     "kind": "pattern (test.ml[1,0+4]..test.ml[1,0+5])
-    Tpat_var \"f/281\"
+    Tpat_var \"f/282\"
     sort value
-    value_mode meet(local,once,nonportable,yielding,stateful)(modevar#2[global,many,portable,unyielding,stateless .. global,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
+    value_mode meet(local,once,nonportable,unforkable,yielding,stateful)(modevar#2[global,many,portable,forkable,unyielding,stateless .. global,once,nonportable,unforkable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
   ",
                     "children": []
                   },
@@ -228,9 +228,9 @@
                         "ghost": false,
                         "attrs": [],
                         "kind": "pattern (test.ml[1,0+6]..test.ml[1,0+9])
-    Tpat_var \"x/283\"
+    Tpat_var \"x/284\"
     sort '_representable_layout_1
-    value_mode map_comonadic(local_to_regional)(modevar#6[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#7[aliased,contended,immutable .. unique,uncontended,read_write])
+    value_mode map_comonadic(local_to_regional)(modevar#6[global,many,portable,forkable,unyielding,stateless .. local,once,nonportable,unforkable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#7[aliased,contended,immutable .. unique,uncontended,read_write])
   ",
                         "children": []
                       },
@@ -460,9 +460,9 @@
     Tpat_construct \"Some\"
     [
       pattern (test.ml[4,57+9]..test.ml[4,57+12])
-        Tpat_var \"_aa/284\"
+        Tpat_var \"_aa/285\"
         sort value
-        value_mode global,many,portable,unyielding,stateless;unique,uncontended,read_write
+        value_mode global,many,portable,forkable,unyielding,stateless;unique,uncontended,read_write
     ]
     None
   ",
@@ -480,9 +480,9 @@
                                         "ghost": false,
                                         "attrs": [],
                                         "kind": "pattern (test.ml[4,57+9]..test.ml[4,57+12])
-    Tpat_var \"_aa/284\"
+    Tpat_var \"_aa/285\"
     sort value
-    value_mode global,many,portable,unyielding,stateless;unique,uncontended,read_write
+    value_mode global,many,portable,forkable,unyielding,stateless;unique,uncontended,read_write
   ",
                                         "children": []
                                       }

tests/test-dirs/inconsistent-assumptions.t

@@ -68,8 +68,8 @@ Do an update that breaks the build:
   $ $OCAMLC -c -w @a-40-41-42-49-70 -short-paths -open My_lib__ -o my_lib__Bar bar.ml
   $ $OCAMLC -c -w @a-40-41-42-49-70 -short-paths -open My_lib__ -o my_lib__Foo foo.ml 2>&1 | head -n 3
   File "foo.ml", line 4, characters 11-12:
-  4 | let x, _ = x + 1, Bar.b
-                 ^
+  Error: This expression has type char but an expression was expected of type
+           int
   $ cd ..
 
 Go to the file, and ask merlin to move you to the error:

tests/test-dirs/mode-recovery.t

@@ -87,9 +87,9 @@ The error is reported and foo still has mode nonportable
   >   | revert-newlines \
   >   | jq .value[].message -r
   The value foo is nonportable
-  because it closes over the value y (at File "closure2.ml", line 3, characters 2-3)
+  because it contains a usage (of the value y at File "closure2.ml", line 3, characters 2-3)
   which is expected to be uncontended.
-  However, the highlighted expression is expected to be portable
+  However, the highlighted value foo is expected to be portable
   because it is used inside a function which is expected to be portable.
   The value bar is nonportable but is expected to be portable
   because it is used inside a function which is expected to be portable.

tests/test-dirs/server-tests/typer-cache/stamps.t/run.t

@@ -8,31 +8,31 @@ buffers, and different runs for the same buffer:
   $ echo "let f x = x" | \
   > $MERLIN server dump -what browse -filename test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/281\"
-    Tpat_var \"x/283\"
+    Tpat_var \"f/282\"
+    Tpat_var \"x/284\"
 
   $ echo "let f x = let () = () in x" | \
   > $MERLIN server dump -what browse -filename test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/284\"
-    Tpat_var \"x/286\"
+    Tpat_var \"f/285\"
+    Tpat_var \"x/287\"
 
   $ echo "let f x = x" | \
   > $MERLIN server dump -what browse -filename other_test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/281\"
-    Tpat_var \"x/283\"
+    Tpat_var \"f/282\"
+    Tpat_var \"x/284\"
 
   $ echo "let f x = let () = () in x" | \
   > $MERLIN server dump -what browse -filename test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/284\"
-    Tpat_var \"x/286\"
+    Tpat_var \"f/285\"
+    Tpat_var \"x/287\"
 
   $ echo "let f x = x" | \
   > $MERLIN server dump -what browse -filename test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/287\"
-    Tpat_var \"x/289\"
+    Tpat_var \"f/288\"
+    Tpat_var \"x/290\"
 
   $ $MERLIN server stop-server

tests/test-dirs/type-enclosing/issue1335.t

@@ -89,7 +89,7 @@ provide better result.
           "line": 1,
           "col": 25
         },
-        "type": "type t1 : value mod non_float = [ `A of [ `A of 'a | `B ] as 'a | `B ]",
+        "type": "type t1 : immutable_data with t1 = [ `A of [ `A of 'a | `B ] as 'a | `B ]",
         "tail": "no"
       }
     ],

tests/test-dirs/type-enclosing/kinds.t

@@ -75,7 +75,7 @@ Non-Tconstr types
   Verbosity 0:
   type t = [ `Bar of int | `Foo ]
   Verbosity 1:
-  type t : value mod non_float = [ `Bar of int | `Foo ]
+  type t : immutable_data with int = [ `Bar of int | `Foo ]
 
 Module types
 # CR-someday: Make kinds get printed when verbosity is 1

tests/test-dirs/type-enclosing/underscore-ids.t

@@ -443,9 +443,9 @@ We try several places in the identifier to check the result stability
       [
         <def>
           pattern (under.ml[1,0+4]..under.ml[1,0+6])
-            Tpat_var \"aa/281\"
+            Tpat_var \"aa/282\"
             sort value
-            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#2[global,many,portable,unyielding,stateless .. global,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
+            value_mode meet(local,once,nonportable,unforkable,yielding,stateful)(modevar#2[global,many,portable,forkable,unyielding,stateless .. global,once,nonportable,unforkable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (under.ml[1,0+9]..under.ml[1,0+12])
             Texp_constant Const_float 4.2
       ]
@@ -454,19 +454,19 @@ We try several places in the identifier to check the result stability
       [
         <def>
           pattern (under.ml[2,13+4]..under.ml[2,13+5])
-            Tpat_var \"f/282\"
+            Tpat_var \"f/283\"
             sort value
-            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#9[global,many,portable,unyielding,stateless .. global,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#a[aliased,contended,immutable .. unique,uncontended,read_write])
+            value_mode meet(local,once,nonportable,unforkable,yielding,stateful)(modevar#9[global,many,portable,forkable,unyielding,stateless .. global,once,nonportable,unforkable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#a[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (under.ml[2,13+6]..under.ml[5,70+17]) ghost
             Texp_function
-            alloc_mode map_comonadic(regional_to_global)(modevar#b[global,many,portable,unyielding,stateless .. global,once,nonportable,yielding,stateful]);id(modevar#c[aliased,contended,immutable .. unique,uncontended,read_write])
+            alloc_mode map_comonadic(regional_to_global)(modevar#b[global,many,portable,forkable,unyielding,stateless .. global,once,nonportable,unforkable,yielding,stateful]);id(modevar#c[aliased,contended,immutable .. unique,uncontended,read_write])
             [
               Nolabel
               Param_pat
                 pattern (under.ml[2,13+6]..under.ml[2,13+9])
-                  Tpat_var \"x/284\"
+                  Tpat_var \"x/285\"
                   sort '_representable_layout_1
-                  value_mode map_comonadic(local_to_regional)(modevar#d[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#e[aliased,contended,immutable .. unique,uncontended,read_write])
+                  value_mode map_comonadic(local_to_regional)(modevar#d[global,many,portable,forkable,unyielding,stateless .. local,once,nonportable,unforkable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#e[aliased,contended,immutable .. unique,uncontended,read_write])
             ]
             Tfunction_body
               expression (under.ml[2,13+18]..under.ml[5,70+17])
@@ -479,7 +479,7 @@ We try several places in the identifier to check the result stability
                       expression (_none_[0,0+-1]..[0,0+-1]) ghost
                         Pexp_constant PConst_int (1,None)
                   ]
-                Texp_ident \"*type-error*/287\"
+                Texp_ident \"*type-error*/288\"
       ]
   ]