.

Author: craigfe

src/alcotest-engine/core.ml

@@ -107,6 +107,7 @@ module Make (P : Platform.MAKER) (M : Monad.S) = struct
     { suite; errors = []; loc; config; run_id; log_trap; progress_reporter }
 
   type 'a test = 'a Suite.test
+  type 'a extra_info = ?here:Source_code_position.here -> ?tags:Tag.Set.t -> 'a
 
   let bt () = match Printexc.get_backtrace () with "" -> "" | s -> "\n" ^ s
 

src/alcotest-engine/core_intf.ml

@@ -118,7 +118,7 @@ module Unstable_types = struct
     type 'a test
     (** The type of unit tests. *)
 
-    type 'a extra_info := ?here:Source_code_position.here -> ?tags:tag_set -> 'a
+    type 'a extra_info = ?here:Source_code_position.here -> ?tags:tag_set -> 'a
     (** Tests and test groups can be located by attaching source code positions
         to them. *)
 

src/alcotest-engine/model.ml

@@ -50,6 +50,9 @@ module Suite (M : Monad.S) = struct
   module M = Monad.Extend (M)
   open M.Syntax
 
+  type filter_result = [ `Run | `Skip ]
+  type filter = Tag.Set.t -> filter_result
+
   type 'a test =
     | Test of {
         name : Safe_string.t;

src/alcotest-engine/model.mli

@@ -31,8 +31,8 @@ end
 
 module Suite (M : Monad.S) : sig
   type 'a test
-  type filter_result := [ `Run | `Skip ]
-  type filter := Tag.Set.t -> filter_result
+  type filter_result = [ `Run | `Skip ]
+  type filter = Tag.Set.t -> filter_result
 
   val test :
     name:string ->

src/alcotest-engine/pp_intf.ml

@@ -100,7 +100,7 @@ module type Pp = sig
   val user_error : ('a, Format.formatter, unit, _) format4 -> 'a
   (** Raise a user error, then fail. *)
 
-  module Width_sensitive (_ : sig
+  module Width_sensitive (X : sig
     val stdout_columns : unit -> int option
   end) : Width_sensitive with type event := event and type result := result
 end

src/alcotest-engine/tag.ml

@@ -69,22 +69,21 @@ module Set = struct
     try
       let (V (k', v)) = Map.find (V k) t in
       match Type_id.equal k.type_id k'.type_id with
-      | Some Refl -> Some v
+      | Some Type_id.Refl -> Some v
       | None -> assert false
     with Not_found -> None
 
-  let to_list = Map.to_seq >> List.of_seq >> List.map snd
+  let to_list = Map.bindings >> List.map snd
 
   let fold_until =
-    let rec aux ~f ~finish acc seq =
-      match seq () with
-      | Seq.Cons ((_k, v), xf) -> (
+    let rec aux ~f ~finish acc = function
+      | [] -> finish acc
+      | (_k, v) :: xs -> (
           match f acc v with
-          | Continue acc -> aux ~f ~finish acc xf
+          | Continue acc -> aux ~f ~finish acc xs
           | Stop final -> final)
-      | Seq.Nil -> finish acc
     in
-    fun t ~init ~f ~finish -> aux ~f ~finish init (Map.to_seq t)
+    fun t ~init ~f ~finish -> aux ~f ~finish init (Map.bindings t)
 end
 
 module Speed_level = struct

src/alcotest/alcotest.ml

@@ -1,3 +1,4 @@
+open! Alcotest_stdlib_ext
 include Alcotest_engine.V1.Test
 
 module Unix_platform (M : Alcotest_engine.Monad.S) = struct