1.7.0: Upgrade to lwt 5.6

Author: SGrondin

ADB.opam

@@ -19,7 +19,7 @@ depends: [
 
   "core" { >= "v0.15.0" }
   "re"
-  "lwt" { >= "5.2.0" & < "6.0.0" }
+  "lwt" { >= "5.6.0" & < "6.0.0" }
 
   "caqti" { >= "1.0.0" & < "2.0.0" }
   "caqti-lwt"

README.md

@@ -6,12 +6,12 @@ Add to your OPAM file:
 ```
 # You may need to add the pin-depends section:
 pin-depends: [
-  [ "ADB.1.6.0" "git+https://github.com/asemio/ADB.git#v1.6.0" ]
+  [ "ADB.1.7.0" "git+https://github.com/asemio/ADB.git#v1.7.0" ]
 ]
 
 # Add to the depends section:
 depends: [
-  "ADB" { = "1.6.0" }
+  "ADB" { = "1.7.0" }
 ]
 ```
 

dune-project

@@ -1,3 +1,3 @@
 (lang dune 2.0)
 (name ADB)
-(version 1.6.0)
+(version 1.7.0)

src/adb/PG.ml

@@ -104,14 +104,14 @@ let combined_to_error = function
  |(`Connect_failed _ as caqti) ->
   Caqti_error.show caqti |> Error.of_string
 
-let lift_user_error err = Lwt_result.map_err (fun x -> `User_error x) err
+let lift_user_error err = Lwt_result.map_error (fun x -> `User_error x) err
 
 let lift_mixed_errors (ll : S.combined list) : ('a, S.combined) result =
   Error (`Mixed_error (ll |> List.map ~f:combined_to_error))
 
 let lift_unexpected_exn exn = Lwt.return_error (`Unexpected_exception exn)
 
-let lift_caqti_error err = Lwt_result.map_err (fun x -> `Caqti x) err
+let lift_caqti_error err = Lwt_result.map_error (fun x -> `Caqti x) err
 
 (*
 User_error: business logic error as opposed to DB or system errors.
@@ -152,7 +152,7 @@ let do_transaction { pool; log_statements; _ } ~f () =
       (* ERROR: ROLLBACK *)
       | Error err1 as res -> do_rollback ~rollback:M.rollback res err1)
     pool
-  |> Lwt_result.map_err (function
+  |> Lwt_result.map_error (function
        | `User_error err -> err
        | `Unexpected_exception exn -> raise exn
        | x -> combined_to_error x)