Skip to content

Commit 915f621

Browse files
liam923liam923
committed
Promote tests
1 parent c8dff72 commit 915f621

File tree

8 files changed

+62
-62
lines changed

8 files changed

+62
-62
lines changed

‎tests/test-dirs/function-recovery.t‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"value": "[
1111
structure_item (test.ml[1,0+0]..test.ml[3,104+28])
1212
Tstr_module
13-
ERROR_locate_from_inside_function_literal_used_as_non_function/281
13+
ERROR_locate_from_inside_function_literal_used_as_non_function/282
1414
module_expr (test.ml[1,0+72]..test.ml[3,104+28])
1515
Tmod_structure
1616
[
@@ -19,7 +19,7 @@
1919
[
2020
<def>
2121
pattern (test.ml[2,79+6]..test.ml[2,79+13])
22-
Tpat_var \"problem/279\"
22+
Tpat_var \"problem/280\"
2323
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,contended .. unique,uncontended])
2424
expression (test.ml[2,79+16]..test.ml[2,79+24])
2525
Texp_variant \"Problem\"
@@ -48,7 +48,7 @@
4848
expression (_none_[0,0+-1]..[0,0+-1]) ghost
4949
Pexp_constant PConst_int (1,None)
5050
]
51-
Texp_ident \"*type-error*/280\"
51+
Texp_ident \"*type-error*/281\"
5252
]
5353
]
5454
]
@@ -68,7 +68,7 @@
6868
[
6969
<def>
7070
pattern (type.ml[1,0+4]..type.ml[1,0+5])
71-
Tpat_var \"f/279\"
71+
Tpat_var \"f/280\"
7272
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,contended .. unique,uncontended])
7373
expression (type.ml[1,0+8]..type.ml[1,0+61])
7474
extra
@@ -85,10 +85,10 @@
8585
Ttyp_constr \"list/11!\"
8686
[
8787
core_type (type.ml[1,0+28]..type.ml[1,0+29])
88-
Ttyp_constr \"t/281\"
88+
Ttyp_constr \"t/282\"
8989
[]
9090
]
91-
Tpat_var \"foo/282\"
91+
Tpat_var \"foo/283\"
9292
value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding .. local,once,nonportable,yielding]);join(aliased,contended)(modevar#5[aliased,contended .. unique,uncontended])
9393
]
9494
Tfunction_body
@@ -100,7 +100,7 @@
100100
extra
101101
Tpat_extra_constraint
102102
core_type (type.ml[1,0+48]..type.ml[1,0+49])
103-
Ttyp_constr \"t/281\"
103+
Ttyp_constr \"t/282\"
104104
[]
105105
Tpat_any
106106
expression (type.ml[1,0+53]..type.ml[1,0+55])
@@ -113,7 +113,7 @@
113113
expression (_none_[0,0+-1]..[0,0+-1]) ghost
114114
Pexp_constant PConst_int (1,None)
115115
]
116-
Texp_ident \"*type-error*/283\"
116+
Texp_ident \"*type-error*/284\"
117117
]
118118
expression (type.ml[1,0+59]..type.ml[1,0+61])
119119
attribute \"merlin.loc\"
@@ -192,7 +192,7 @@
192192
"ghost": false,
193193
"attrs": [],
194194
"kind": "pattern (test.ml[1,0+4]..test.ml[1,0+5])
195-
Tpat_var \"f/279\"
195+
Tpat_var \"f/280\"
196196
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,contended .. unique,uncontended])
197197
",
198198
"children": []
@@ -224,7 +224,7 @@
224224
"ghost": false,
225225
"attrs": [],
226226
"kind": "pattern (test.ml[1,0+6]..test.ml[1,0+9])
227-
Tpat_var \"x/281\"
227+
Tpat_var \"x/282\"
228228
value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding .. local,once,nonportable,yielding]);join(aliased,contended)(modevar#5[aliased,contended .. unique,uncontended])
229229
",
230230
"children": []
@@ -455,7 +455,7 @@
455455
Tpat_construct \"Some\"
456456
[
457457
pattern (test.ml[4,57+9]..test.ml[4,57+12])
458-
Tpat_var \"_aa/282\"
458+
Tpat_var \"_aa/283\"
459459
value_mode global,many,portable,unyielding;unique,uncontended
460460
]
461461
None
@@ -474,7 +474,7 @@
474474
"ghost": false,
475475
"attrs": [],
476476
"kind": "pattern (test.ml[4,57+9]..test.ml[4,57+12])
477-
Tpat_var \"_aa/282\"
477+
Tpat_var \"_aa/283\"
478478
value_mode global,many,portable,unyielding;unique,uncontended
479479
",
480480
"children": []

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ buffers, and different runs for the same buffer:
88
$ echo "let f x = x" | \
99
> $MERLIN server dump -what browse -filename test.ml | \
1010
> sed 's:\\n:\n:g' | grep Tpat_var
11-
Tpat_var \"f/279\"
12-
Tpat_var \"x/281\"
11+
Tpat_var \"f/280\"
12+
Tpat_var \"x/282\"
1313
1414
$ echo "let f x = let () = () in x" | \
1515
> $MERLIN server dump -what browse -filename test.ml | \
1616
> sed 's:\\n:\n:g' | grep Tpat_var
17-
Tpat_var \"f/282\"
18-
Tpat_var \"x/284\"
17+
Tpat_var \"f/283\"
18+
Tpat_var \"x/285\"
1919
2020
$ echo "let f x = x" | \
2121
> $MERLIN server dump -what browse -filename other_test.ml | \
2222
> sed 's:\\n:\n:g' | grep Tpat_var
23-
Tpat_var \"f/279\"
24-
Tpat_var \"x/281\"
23+
Tpat_var \"f/280\"
24+
Tpat_var \"x/282\"
2525
2626
$ echo "let f x = let () = () in x" | \
2727
> $MERLIN server dump -what browse -filename test.ml | \
2828
> sed 's:\\n:\n:g' | grep Tpat_var
29-
Tpat_var \"f/282\"
30-
Tpat_var \"x/284\"
29+
Tpat_var \"f/283\"
30+
Tpat_var \"x/285\"
3131
3232
$ echo "let f x = x" | \
3333
> $MERLIN server dump -what browse -filename test.ml | \
3434
> sed 's:\\n:\n:g' | grep Tpat_var
35-
Tpat_var \"f/285\"
36-
Tpat_var \"x/287\"
35+
Tpat_var \"f/286\"
36+
Tpat_var \"x/288\"
3737
3838
$ $MERLIN server stop-server

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ provide better result.
4848
"line": 4,
4949
"col": 15
5050
},
51-
"type": "type 'k baz = Foo | Bar of 'k t",
51+
"type": "type 'k baz : immutable_data = Foo | Bar of 'k t",
5252
"tail": "no"
5353
}
5454
],

‎tests/test-dirs/type-enclosing/issue1755.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ provide better result.
4545
"line": 1,
4646
"col": 25
4747
},
48-
"type": "type a = A | B of int * b",
48+
"type": "type a : immutable_data = A | B of int * b",
4949
"tail": "no"
5050
}
5151
],

‎tests/test-dirs/type-enclosing/jane-street.t/run.t‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ escape characters in string literals, so we use the revert-newlines script.
5454
type t3 : value = D | E of int
5555
^
5656
With verbosity 0: "type t3 = D | E of int"
57-
With verbosity 1: "type t3 = D | E of int"
57+
With verbosity 1: "type t3 : immutable_data = D | E of int"
5858

5959
type t4 : immediate64 = A
6060
^
@@ -206,7 +206,7 @@ escape characters in string literals, so we use the revert-newlines script.
206206
let f3 (x : t3) = x
207207
^
208208
With verbosity 0: "type t3 = D | E of int"
209-
With verbosity 1: "type t3 = D | E of int"
209+
With verbosity 1: "type t3 : immutable_data = D | E of int"
210210

211211
let f4 (x : t4) = x
212212
^
@@ -361,7 +361,7 @@ escape characters in string literals, so we use the revert-newlines script.
361361
type 'a p1 = A1 of 'a
362362
^
363363
With verbosity 0: "type 'a p1 = A1 of 'a"
364-
With verbosity 1: "type 'a p1 = A1 of 'a"
364+
With verbosity 1: "type 'a p1 : immutable_data with 'a = A1 of 'a"
365365

366366
type ('a : immediate) p2 = A2 of 'a [@@unboxed]
367367
^

‎tests/test-dirs/type-enclosing/types.t/run.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ FIXME: A type with a type param shouldn't equal itself - aliasing a list type
113113
}
114114
]
115115

116-
Same result regardless of verbosity:
116+
Shows kind with increased verbosity:
117117

118118
$ $MERLIN single type-enclosing -short-paths -position 11:9 -verbosity 1 \
119119
> -filename ./types.ml < ./types.ml | jq ".value"
@@ -127,7 +127,7 @@ Same result regardless of verbosity:
127127
"line": 11,
128128
"col": 19
129129
},
130-
"type": "type 'a l = 'a l",
130+
"type": "type 'a l : immutable_data with 'a = 'a l",
131131
"tail": "no"
132132
}
133133
]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ We try several places in the identifier to check the result stability
371371
[
372372
<def>
373373
pattern (under.ml[1,0+4]..under.ml[1,0+6])
374-
Tpat_var \"aa/279\"
374+
Tpat_var \"aa/280\"
375375
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,contended .. unique,uncontended])
376376
expression (under.ml[1,0+9]..under.ml[1,0+12])
377377
Texp_constant Const_float 4.2
@@ -381,7 +381,7 @@ We try several places in the identifier to check the result stability
381381
[
382382
<def>
383383
pattern (under.ml[2,13+4]..under.ml[2,13+5])
384-
Tpat_var \"f/280\"
384+
Tpat_var \"f/281\"
385385
value_mode meet(local,once,nonportable,yielding)(modevar#5[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#6[aliased,contended .. unique,uncontended])
386386
expression (under.ml[2,13+6]..under.ml[5,70+17]) ghost
387387
Texp_function
@@ -390,7 +390,7 @@ We try several places in the identifier to check the result stability
390390
Nolabel
391391
Param_pat
392392
pattern (under.ml[2,13+6]..under.ml[2,13+9])
393-
Tpat_var \"x/282\"
393+
Tpat_var \"x/283\"
394394
value_mode map_comonadic(local_to_regional)(modevar#9[global,many,portable,unyielding .. local,once,nonportable,yielding]);join(aliased,contended)(modevar#a[aliased,contended .. unique,uncontended])
395395
]
396396
Tfunction_body
@@ -404,7 +404,7 @@ We try several places in the identifier to check the result stability
404404
expression (_none_[0,0+-1]..[0,0+-1]) ghost
405405
Pexp_constant PConst_int (1,None)
406406
]
407-
Texp_ident \"*type-error*/285\"
407+
Texp_ident \"*type-error*/286\"
408408
]
409409
]
410410

0 commit comments

Comments
 (0)