Use Testable.errormsg

Author: Leonidas-from-XIV

test/lib/test_block.ml

@@ -32,7 +32,7 @@ let test_mk =
                 `Msg ({|File "_none_", line 1: invalid code block: |} ^ m))
           expected
       in
-      Alcotest.(check (result Testable.block Testable.msg))
+      Alcotest.(check (Testable.errormsg Testable.block))
         test_name expected actual
     in
     (test_name, `Quick, test_fun)

test/lib/test_label.ml

@@ -1,11 +1,8 @@
 module Testable = struct
   open Mdx.Label
+  include Testable
 
   let relation = Alcotest.testable Relation.pp ( = )
-
-  let msg =
-    Alcotest.testable (fun fmt (`Msg e) -> Format.pp_print_string fmt e) ( = )
-
   let label = Alcotest.testable pp ( = )
 end
 
@@ -31,7 +28,7 @@ let test_raw_parse =
   ]
 
 let test_interpret =
-  let ty = Alcotest.result Testable.label Testable.msg in
+  let ty = Testable.errormsg Testable.label in
   let make_test ~label ~value ~expected =
     let test_name = Printf.sprintf "interpret: %S" label in
     let test_fun () =