Replace another use of int_of_string

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Oct 30, 2019 · e603cd7 · e603cd7
1 parent 88f95fb
commit e603cd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/dune_manager/utils.ml b/src/dune_manager/utils.ml
@@ -1,8 +1,9 @@
 open Stdune
 
 let int_of_string ?where s =
-  try Result.Ok (int_of_string s)
-  with Failure _ ->
+  match Int.of_string s with
+  | Some s -> Ok s
+  | None ->
     Result.Error
       (Printf.sprintf "invalid integer%s: %s"
          ( match where with

diff --git a/src/stdune/list.ml b/src/stdune/list.ml
@@ -189,7 +189,7 @@ let unzip l =
   fold_right ~init:([], []) ~f:(fun (x, y) (xs, ys) -> (x :: xs, y :: ys)) l
 
 let rec for_all2 x y ~f =
-  match x, y with
+  match (x, y) with
   | [], [] -> Ok true
   | x :: xs, y :: ys ->
     if f x y then