Update opium-testing apis to avoid warning 16 (#275)

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         ocaml-compiler:
-          - 4.11.x
+          - 4.13.x
         include:
           - os: ubuntu-latest
             ocaml-compiler: 4.08.x

CHANGES.md

@@ -11,6 +11,10 @@
 - Fix Fullsplat behavior (routes with `**`)
 - Undo splat reverse order. Now, the matches for `/*/*/*` with the url `/a/b/c` will return `["a"; "b"; "c"]`
 
+## Changed
+
+- Update various opium-testing apis to avoid raising warning 16
+
 # 0.20.0
 
 ## Added

opium-testing/src/opium_testing.ml

@@ -34,7 +34,7 @@ let check_status ?msg expected t =
   Alcotest.check Testable.status message expected t
 ;;
 
-let check_status' ?msg ~expected ~actual = check_status ?msg expected actual
+let check_status' ?msg ~expected ~actual () = check_status ?msg expected actual
 
 let check_meth ?msg expected t =
   let message =
@@ -45,7 +45,7 @@ let check_meth ?msg expected t =
   Alcotest.check Testable.meth message expected t
 ;;
 
-let check_meth' ?msg ~expected ~actual = check_meth ?msg expected actual
+let check_meth' ?msg ~expected ~actual () = check_meth ?msg expected actual
 
 let check_version ?msg expected t =
   let message =
@@ -56,7 +56,7 @@ let check_version ?msg expected t =
   Alcotest.check Testable.version message expected t
 ;;
 
-let check_version' ?msg ~expected ~actual = check_version ?msg expected actual
+let check_version' ?msg ~expected ~actual () = check_version ?msg expected actual
 
 let check_body ?msg expected t =
   let message =
@@ -67,7 +67,7 @@ let check_body ?msg expected t =
   Alcotest.check Testable.body message expected t
 ;;
 
-let check_body' ?msg ~expected ~actual = check_body ?msg expected actual
+let check_body' ?msg ~expected ~actual () = check_body ?msg expected actual
 
 let check_request ?msg expected t =
   let message =
@@ -78,7 +78,7 @@ let check_request ?msg expected t =
   Alcotest.check Testable.request message expected t
 ;;
 
-let check_request' ?msg ~expected ~actual = check_request ?msg expected actual
+let check_request' ?msg ~expected ~actual () = check_request ?msg expected actual
 
 let check_response ?msg expected t =
   let message =
@@ -89,7 +89,7 @@ let check_response ?msg expected t =
   Alcotest.check Testable.response message expected t
 ;;
 
-let check_response' ?msg ~expected ~actual = check_response ?msg expected actual
+let check_response' ?msg ~expected ~actual () = check_response ?msg expected actual
 
 let string_contains s1 s2 =
   let re = Str.regexp_string s2 in
@@ -120,4 +120,4 @@ let check_cookie ?msg expected t =
   Alcotest.check Testable.cookie message expected t
 ;;
 
-let check_cookie' ?msg ~expected ~actual = check_cookie ?msg expected actual
+let check_cookie' ?msg ~expected ~actual () = check_cookie ?msg expected actual

opium-testing/src/opium_testing.mli

@@ -50,6 +50,7 @@ val check_status'
   -> expected:Opium.Status.t
   -> actual:Opium.Status.t
   -> unit
+  -> unit
 
 (** {3 [check_meth]} *)
 
@@ -61,7 +62,12 @@ val check_meth : ?msg:string -> Opium.Method.t -> Opium.Method.t -> unit
 (** [check_meth' ?msg t1 t2] checks that the method [t1] and [t2] are equal.
 
     This is a labeled variant of {!check_meth} *)
-val check_meth' : ?msg:string -> expected:Opium.Method.t -> actual:Opium.Method.t -> unit
+val check_meth'
+  :  ?msg:string
+  -> expected:Opium.Method.t
+  -> actual:Opium.Method.t
+  -> unit
+  -> unit
 
 (** {3 [check_version]} *)
 
@@ -78,6 +84,7 @@ val check_version'
   -> expected:Opium.Version.t
   -> actual:Opium.Version.t
   -> unit
+  -> unit
 
 (** {3 [check_body]} *)
 
@@ -89,7 +96,12 @@ val check_body : ?msg:string -> Opium.Body.t -> Opium.Body.t -> unit
 (** [check_body' ?msg t1 t2] checks that the body [t1] and [t2] are equal.
 
     This is a labeled variant of {!check_body} *)
-val check_body' : ?msg:string -> expected:Opium.Body.t -> actual:Opium.Body.t -> unit
+val check_body'
+  :  ?msg:string
+  -> expected:Opium.Body.t
+  -> actual:Opium.Body.t
+  -> unit
+  -> unit
 
 (** {3 [check_request]} *)
 
@@ -106,6 +118,7 @@ val check_request'
   -> expected:Opium.Request.t
   -> actual:Opium.Request.t
   -> unit
+  -> unit
 
 (** {3 [check_response]} *)
 
@@ -122,6 +135,7 @@ val check_response'
   -> expected:Opium.Response.t
   -> actual:Opium.Response.t
   -> unit
+  -> unit
 
 (** {3 [check_cookie]} *)
 
@@ -138,6 +152,7 @@ val check_cookie'
   -> expected:Opium.Cookie.t
   -> actual:Opium.Cookie.t
   -> unit
+  -> unit
 
 (** {3 [check_body_contains]} *)
 

opium/src/handlers/handler_serve.ml

@@ -1,6 +1,6 @@
 open Import
 
-let respond_with_file ?headers ~read =
+let respond_with_file ?headers read =
   let open Lwt.Syntax in
   let* body = read () in
   match body with
@@ -41,5 +41,5 @@ let h ?mime_type ?etag ?(headers = Httpaf.Headers.empty) read req =
   in
   if request_matches_etag
   then Lwt.return @@ Response.make ~status:`Not_modified ~headers ()
-  else respond_with_file ~read ~headers
+  else respond_with_file ~headers read
 ;;