flambda-backend: Consequence of b5b4815 on expect tests (removing empty lines).

Author: xclerc

testsuite/tests/basic-modules/recursive_module_evaluation_errors.ml

@@ -36,9 +36,7 @@ type t = ..
 module rec A: sig type t += A end = struct type t += A = B.A end
 and B:sig type t += A end = struct type t += A = A.A end
 [%%expect {|
-
 type t = ..
-
 Line 2, characters 36-64:
 2 | module rec A: sig type t += A end = struct type t += A = B.A end
                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -65,7 +63,6 @@ end = struct
 end
 and B: sig val value: unit end = struct let value = A.f () end
 [%%expect {|
-
 Lines 4-7, characters 6-3:
 4 | ......struct
 5 |   module F(X:sig end) = struct end
@@ -96,7 +93,6 @@ module F(X: sig module type t module M: t end) = struct
   and B: sig val value: unit end = struct let value  = A.f () end
 end
 [%%expect {|
-
 Lines 5-8, characters 8-5:
 5 | ........struct
 6 |     module M = X.M
@@ -119,6 +115,5 @@ Line 9, characters 13-28:
 module rec M: sig val f: unit -> int end = struct let f () = N.x end
 and N:sig val x: int end = struct let x = M.f () end;;
 [%%expect {|
-
 Exception: Undefined_recursive_module ("", 1, 43).
 |}]

testsuite/tests/basic-more/tailannots.ml

@@ -24,7 +24,6 @@ let bad_annot_2 () =
   nop () [@tail];
   nop ()
 [%%expect{|
-
 Line 2, characters 2-8:
 2 |   nop () [@tail];
       ^^^^^^
@@ -35,7 +34,6 @@ let bad_annot_3 () =
   nop () [@tail hint] [@nontail];
   nop ()
 [%%expect{|
-
 Line 2, characters 2-8:
 2 |   nop () [@tail hint] [@nontail];
       ^^^^^^
@@ -46,7 +44,6 @@ let bad_annot_4 () =
   nop () [@tail ajsdiof];
   nop ()
 [%%expect{|
-
 Line 2, characters 9-24:
 2 |   nop () [@tail ajsdiof];
              ^^^^^^^^^^^^^^^
@@ -60,6 +57,5 @@ let good_annot_2 () =
   nop () [@tail hint];
   nop () [@tail hint]
 [%%expect{|
-
 val good_annot_2 : unit -> unit = <fun>
 |}]

testsuite/tests/basic/patmatch_incoherence.ml

@@ -51,7 +51,6 @@ match { x = assert false } with
 | { x = "" } -> ()
 ;;
 [%%expect{|
-
 Lines 1-3, characters 0-18:
 1 | match { x = assert false } with
 2 | | { x = None } -> ()
@@ -68,7 +67,6 @@ match { x = assert false } with
 | { x = `X } -> ()
 ;;
 [%%expect{|
-
 Lines 1-3, characters 0-18:
 1 | match { x = assert false } with
 2 | | { x = None } -> ()
@@ -85,7 +83,6 @@ match { x = assert false } with
 | { x = 3 } -> ()
 ;;
 [%%expect{|
-
 Lines 1-3, characters 0-17:
 1 | match { x = assert false } with
 2 | | { x = [||] } -> ()
@@ -102,7 +99,6 @@ match { x = assert false } with
 | { x = 3 } -> ()
 ;;
 [%%expect{|
-
 Lines 1-3, characters 0-17:
 1 | match { x = assert false } with
 2 | | { x = `X } -> ()
@@ -119,7 +115,6 @@ match { x = assert false } with
 | { x = 3 } -> ()
 ;;
 [%%expect{|
-
 Lines 1-3, characters 0-17:
 1 | match { x = assert false } with
 2 | | { x = `X "lol" } -> ()
@@ -137,7 +132,6 @@ match { x = assert false } with
 | { x = 3 } -> ()
 ;;
 [%%expect{|
-
 Lines 1-4, characters 0-17:
 1 | match { x = assert false } with
 2 | | { x = (2., "") } -> ()

testsuite/tests/comprehensions/array_comprehensions_pure.ml

@@ -179,7 +179,6 @@ Warning 26 [unused-var]: unused variable x.
    v} *)
 [|a for a in [|0|] for a in [|1|]|];;
 [%%expect{|
-
 Line 1, characters 8-9:
 1 | [|a for a in [|0|] for a in [|1|]|];;
             ^
@@ -198,7 +197,6 @@ Warning 26 [unused-var]: unused variable a.
    v} *)
 [|(a, b) for b in [|0|] for _ in [|0; 0|] for a in [|b|] and b = 0 downto -1|];;
 [%%expect{|
-
 - : (int * int) array = [|(0, 0); (0, -1); (0, 0); (0, -1)|]
 |}];;
 
@@ -207,7 +205,6 @@ Warning 26 [unused-var]: unused variable a.
    v} *)
 [|(a, b) for b in [|1|] for b in [|0|] and a in [|b|]|];;
 [%%expect{|
-
 - : (int * int) array = [|(1, 0)|]
 |}];;
 
@@ -216,7 +213,6 @@ Warning 26 [unused-var]: unused variable a.
    v} *)
 [|a for a in [|1|] and _ in [|0; 0|] when a > 0 for a in [|0|]|];;
 [%%expect{|
-
 - : int array = [|0; 0|]
 |}];;
 
@@ -225,7 +221,6 @@ Warning 26 [unused-var]: unused variable a.
    v} *)
 [|a for a in [|0|] and _ in [|0; 0|] for a in [|a; 1|]|];;
 [%%expect{|
-
 - : int array = [|0; 1; 0; 1|]
 |}];;
 
@@ -237,7 +232,6 @@ Warning 26 [unused-var]: unused variable a.
    comprehension. *)
 [|() for _ = 0 to 0|];
 [%%expect{|
-
 - : unit array = [|()|]
 |}];;
 
@@ -248,7 +242,6 @@ Warning 26 [unused-var]: unused variable a.
 
 [|x for x in 100|];;
 [%%expect{|
-
 Line 1, characters 13-16:
 1 | [|x for x in 100|];;
                  ^^^
@@ -262,14 +255,12 @@ Error: This expression has type int but an expression was expected of type
 (* It's unclear why these are different based on principality *)
 [|x for x in []|];;
 [%%expect{|
-
 Line 1, characters 13-15:
 1 | [|x for x in []|];;
                  ^^
 Error: This expression has type 'a list
        but an expression was expected of type 'b array
 |}, Principal{|
-
 Line 1, characters 13-15:
 1 | [|x for x in []|];;
                  ^^
@@ -283,7 +274,6 @@ Error: This expression has type 'a list
 let empty = [] in
 [|x for x in empty|];;
 [%%expect{|
-
 Line 2, characters 13-18:
 2 | [|x for x in empty|];;
                  ^^^^^
@@ -294,7 +284,6 @@ Error: This expression has type 'a list
 
 List.length [|i for i = 0 to 3|];;
 [%%expect{|
-
 Line 1, characters 12-32:
 1 | List.length [|i for i = 0 to 3|];;
                 ^^^^^^^^^^^^^^^^^^^^
@@ -306,7 +295,6 @@ Error: This expression has type 'a array
 
 [|x for x = 1.5 to 4.2|];;
 [%%expect{|
-
 Line 1, characters 12-15:
 1 | [|x for x = 1.5 to 4.2|];;
                 ^^^
@@ -317,7 +305,6 @@ Error: This expression has type float but an expression was expected of type
 
 [|x for x = 4.2 downto 1.5|];;
 [%%expect{|
-
 Line 1, characters 12-15:
 1 | [|x for x = 4.2 downto 1.5|];;
                 ^^^
@@ -338,15 +325,12 @@ let t = (module struct
   let x = 3
 end : S);;
 [%%expect {|
-
 module type S = sig type t val x : t end
-
 val t : (module S) = <module>
 |}];;
 
 [| M.x for (module M : S) in [| t |] |];;
 [%%expect {|
-
 Line 1, characters 19-20:
 1 | [| M.x for (module M : S) in [| t |] |];;
                        ^
@@ -362,7 +346,6 @@ Error: Modules are not allowed in this pattern.
    |]
 |];;
 [%%expect {|
-
 Line 2, characters 15-16:
 2 |    for (module M : S) in
                    ^
@@ -376,7 +359,6 @@ Error: Modules are not allowed in this pattern.
    |]
 |];;
 [%%expect {|
-
 Line 2, characters 15-16:
 2 |    for (module M : S) in
                    ^
@@ -387,7 +369,6 @@ Error: Modules are not allowed in this pattern.
 
 [|i for i = 1 to 3 and i = 3 downto 1|];;
 [%%expect{|
-
 Line 1, characters 0-39:
 1 | [|i for i = 1 to 3 and i = 3 downto 1|];;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -396,7 +377,6 @@ Error: Variable i is bound several times in this matching
 
 [|i for i = 1 to 3 and i in [|10; 20; 30|]|];;
 [%%expect{|
-
 Line 1, characters 23-24:
 1 | [|i for i = 1 to 3 and i in [|10; 20; 30|]|];;
                            ^
@@ -405,7 +385,6 @@ Error: Variable i is bound several times in this matching
 
 [|i for i in [|1; 2; 3|] and i = 3 downto 1|];;
 [%%expect{|
-
 Line 1, characters 0-45:
 1 | [|i for i in [|1; 2; 3|] and i = 3 downto 1|];;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -414,7 +393,6 @@ Error: Variable i is bound several times in this matching
 
 [|i for i in [|1; 2; 3|] and i in [|10; 20; 30|]|];;
 [%%expect{|
-
 Line 1, characters 29-30:
 1 | [|i for i in [|1; 2; 3|] and i in [|10; 20; 30|]|];;
                                  ^
@@ -423,7 +401,6 @@ Error: Variable i is bound several times in this matching
 
 [|i for i, j in [|1, 10; 2, 20; 3, 30|] and k, i in [|10, 1; 20, 2; 30, 3|]|];
 [%%expect{|
-
 Line 1, characters 47-48:
 1 | [|i for i, j in [|1, 10; 2, 20; 3, 30|] and k, i in [|10, 1; 20, 2; 30, 3|]|];
                                                    ^
@@ -434,7 +411,6 @@ Error: Variable i is bound several times in this matching
 
 [|outer,inner for outer = inner to 3 for inner = 1 to 3|];;
 [%%expect{|
-
 Line 1, characters 26-31:
 1 | [|outer,inner for outer = inner to 3 for inner = 1 to 3|];;
                               ^^^^^
@@ -446,7 +422,6 @@ Hint: Did you mean incr?
 
 Array.append [|true|] [|i for i = 0 to 10|];;
 [%%expect{|
-
 Line 1, characters 24-25:
 1 | Array.append [|true|] [|i for i = 0 to 10|];;
                             ^
@@ -462,19 +437,16 @@ module M = struct
   type t = A | B
 end;;
 [%%expect{|
-
 module M : sig type t = A | B end
 |}];;
 
 let x : M.t array  = [|A for _ = 1 to 3|];;
 [%%expect{|
-
 val x : M.t array = [|M.A; M.A; M.A|]
 |}];;
 
 [|A for _ = 1 to 3|];;
 [%%expect{|
-
 Line 1, characters 2-3:
 1 | [|A for _ = 1 to 3|];;
       ^
@@ -483,10 +455,8 @@ Error: Unbound constructor A
 
 Array.append [|M.B|] [|A for _ = 1 to 3|];;
 [%%expect{|
-
 - : M.t array = [|M.B; M.A; M.A; M.A|]
 |}, Principal{|
-
 Line 1, characters 23-24:
 1 | Array.append [|M.B|] [|A for _ = 1 to 3|];;
                            ^