diff --git a/tests/test-dirs/function-recovery.t b/tests/test-dirs/function-recovery.t index 761f184ff..484a87664 100644 --- a/tests/test-dirs/function-recovery.t +++ b/tests/test-dirs/function-recovery.t @@ -35,7 +35,7 @@ None expression (test.ml[3,104+11]..test.ml[3,104+28]) Texp_function - alloc_mode id(modevar#c[global,many,portable .. local,once,nonportable]);id(modevar#d[aliased,contended .. unique,uncontended]) + alloc_mode id(modevar#d[global,many,portable .. local,once,nonportable]);id(modevar#e[aliased,contended .. unique,uncontended]) [] Tfunction_body expression (test.ml[3,104+11]..test.ml[3,104+28]) diff --git a/tests/test-dirs/occurrences/project-wide/punning.t/run.t b/tests/test-dirs/occurrences/project-wide/punning.t/run.t index ba9a54ced..c1fcfd724 100644 --- a/tests/test-dirs/occurrences/project-wide/punning.t/run.t +++ b/tests/test-dirs/occurrences/project-wide/punning.t/run.t @@ -17,9 +17,9 @@ Convenience function for querying occurrences Get occurrences of an identifier that is used as the expression part of a punned let expression -FIXME: this should also include the occurrence on line 6 of usages.ml $ occurrences definitions.ml 1:4 $TESTCASE_ROOT/definitions.ml 1:4-5 + $TESTCASE_ROOT/usages.ml 6:7-8 Get occurrences, with the cursor pointing at the identifier in a punned let. Merlin returns the occurrences of the new variable bound in that let, rather than the diff --git a/tests/test-dirs/search/search-by-type.t/run.t b/tests/test-dirs/search/search-by-type.t/run.t index 499538f9e..798bf62a8 100644 --- a/tests/test-dirs/search/search-by-type.t/run.t +++ b/tests/test-dirs/search/search-by-type.t/run.t @@ -198,7 +198,7 @@ "constructible": "Hashtbl.replace_seq _ _" }, { - "file": "ocaml/stdlib/either.mli", + "file": "stdlib/either.mli", "start": { "line": 86, "col": 0 diff --git a/tests/test-dirs/type-enclosing/underscore-ids.t b/tests/test-dirs/type-enclosing/underscore-ids.t index 9e6800531..542096a8f 100644 --- a/tests/test-dirs/type-enclosing/underscore-ids.t +++ b/tests/test-dirs/type-enclosing/underscore-ids.t @@ -382,16 +382,16 @@ We try several places in the identifier to check the result stability pattern (under.ml[2,13+4]..under.ml[2,13+5]) Tpat_var \"f/276\" - value_mode meet(local,once,nonportable)(modevar#2[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#3[aliased,uncontended .. unique,uncontended]) + value_mode meet(local,once,nonportable)(modevar#3[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#4[aliased,uncontended .. unique,uncontended]) expression (under.ml[2,13+6]..under.ml[5,70+17]) ghost Texp_function - alloc_mode map_comonadic(regional_to_global)(modevar#4[global,many,portable .. global,many,nonportable]);id(modevar#5[aliased,contended .. unique,uncontended]) + alloc_mode map_comonadic(regional_to_global)(modevar#5[global,many,portable .. global,many,nonportable]);id(modevar#6[aliased,contended .. unique,uncontended]) [ Nolabel Param_pat pattern (under.ml[2,13+6]..under.ml[2,13+9]) Tpat_var \"x/278\" - value_mode map_comonadic(local_to_regional)(modevar#6[global,many,portable .. local,once,nonportable]);join(aliased,contended)(modevar#7[aliased,contended .. unique,uncontended]) + value_mode map_comonadic(local_to_regional)(modevar#7[global,many,portable .. local,once,nonportable]);join(aliased,contended)(modevar#8[aliased,contended .. unique,uncontended]) ] Tfunction_body expression (under.ml[2,13+18]..under.ml[5,70+17]) diff --git a/tests/test-dirs/typing-recovery.t b/tests/test-dirs/typing-recovery.t index 875e18b4f..a1f0a13c5 100644 --- a/tests/test-dirs/typing-recovery.t +++ b/tests/test-dirs/typing-recovery.t @@ -594,7 +594,7 @@ make sure we also handle that correctly in structures: None ] Tpat_var \"foo2/276\" - value_mode meet(local,once,nonportable)(modevar#2[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#3[aliased,uncontended .. unique,uncontended]) + value_mode meet(local,once,nonportable)(modevar#3[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#4[aliased,uncontended .. unique,uncontended]) expression (test_ct.ml[3,20+24]..test_ct.ml[3,20+28]) extra Texp_constraint @@ -613,7 +613,7 @@ make sure we also handle that correctly in structures: ] alloc_const_option_mode None,None,None,None,None Texp_tuple - alloc_mode meet(local,once,nonportable,map_comonadic(regional_to_global)(modevar#2[global,many,portable .. global,many,nonportable]));unique,uncontended + alloc_mode meet(local,once,nonportable,map_comonadic(regional_to_global)(modevar#3[global,many,portable .. global,many,nonportable]));unique,uncontended [ Label: None expression (test_ct.ml[3,20+24]..test_ct.ml[3,20+25]) @@ -643,7 +643,7 @@ make sure we also handle that correctly in structures: [] ] Tpat_var \"foo3/277\" - value_mode meet(local,once,nonportable)(modevar#4[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#5[aliased,uncontended .. unique,uncontended]) + value_mode meet(local,once,nonportable)(modevar#6[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#7[aliased,uncontended .. unique,uncontended]) expression (test_ct.ml[5,50+23]..test_ct.ml[5,50+27]) extra Texp_constraint @@ -662,7 +662,7 @@ make sure we also handle that correctly in structures: ] alloc_const_option_mode None,None,None,None,None Texp_tuple - alloc_mode meet(local,once,nonportable,map_comonadic(regional_to_global)(modevar#4[global,many,portable .. global,many,nonportable]));unique,uncontended + alloc_mode meet(local,once,nonportable,map_comonadic(regional_to_global)(modevar#6[global,many,portable .. global,many,nonportable]));unique,uncontended [ Label: None expression (test_ct.ml[5,50+23]..test_ct.ml[5,50+24])