From 2ac47f09c83e9a6a0cab41870e5b7912f9b1700c Mon Sep 17 00:00:00 2001 From: David Sancho Moreno Date: Fri, 25 Aug 2023 12:04:29 +0200 Subject: [PATCH] Push fixes --- dune-project | 4 ++-- packages/belt/src/belt_Array.ml | 2 +- packages/intf_of_sign/{dune => _dune} | 0 server-reason-react.opam | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename packages/intf_of_sign/{dune => _dune} (100%) diff --git a/dune-project b/dune-project index 93220c9c4..733186f51 100644 --- a/dune-project +++ b/dune-project @@ -24,7 +24,7 @@ (synopsis "Rendering React components on the server natively") (depends ;; General system dependencies - (ocaml (and (>= 4.12.0) (< 5.0.0))) + (ocaml (and (>= 4.12.0) (< 5.2.0))) (reason (>= 3.8.1)) melange @@ -41,6 +41,6 @@ (fmt :with-test) ;; Dev dependencies, using with-test so that consumers don't install them (until package is released in opam) - (ocamlformat (and (= 0.21.0) :with-test)) + (ocamlformat :with-test) (ocaml-lsp-server :with-test) )) diff --git a/packages/belt/src/belt_Array.ml b/packages/belt/src/belt_Array.ml index 1c3b74c1b..7d09cd442 100644 --- a/packages/belt/src/belt_Array.ml +++ b/packages/belt/src/belt_Array.ml @@ -461,7 +461,7 @@ let unzip a = let sliceToEnd a offset = let lena = length a in - let ofs = if offset < 0 then Pervasives.max (lena + offset) 0 else offset in + let ofs = if offset < 0 then Stdlib.max (lena + offset) 0 else offset in let len = if lena > ofs then lena - ofs else 0 in Stdlib.Array.init len (fun i -> getUnsafe a (ofs + i)) diff --git a/packages/intf_of_sign/dune b/packages/intf_of_sign/_dune similarity index 100% rename from packages/intf_of_sign/dune rename to packages/intf_of_sign/_dune diff --git a/server-reason-react.opam b/server-reason-react.opam index 2b5861113..36a01ebbb 100644 --- a/server-reason-react.opam +++ b/server-reason-react.opam @@ -8,7 +8,7 @@ homepage: "https://github.com/ml-in-barcelona/server-reason-react" bug-reports: "https://github.com/ml-in-barcelona/server-reason-react/issues" depends: [ "dune" {>= "3.8"} - "ocaml" {>= "4.12.0" & < "5.0.0"} + "ocaml" {>= "4.12.0" & < "5.2.0"} "reason" {>= "3.8.1"} "melange" "ppxlib" {>= "0.23.0"} @@ -19,7 +19,7 @@ depends: [ "alcotest" {with-test} "alcotest-lwt" {with-test} "fmt" {with-test} - "ocamlformat" {= "0.21.0" & with-test} + "ocamlformat" {with-test} "ocaml-lsp-server" {with-test} "odoc" {with-doc} ]