From 2b307bfe99f800fbe14ee3967f40604d09a5e586 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sat, 30 Jun 2018 17:16:39 +0700 Subject: [PATCH] Use Option.some_if when checking for workspace file Signed-off-by: Rudi Grinberg --- src/main.ml | 5 +---- test/blackbox-tests/test-cases/workspaces/run.t | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main.ml b/src/main.ml index ca61b206..7bdec808 100644 --- a/src/main.ml +++ b/src/main.ml @@ -62,10 +62,7 @@ let setup ?(log=Log.no_log) | _ -> match let p = Path.of_string Workspace.filename in - if Path.exists p then - Some p - else - None + Option.some_if (Path.exists p) p with | Some p -> Workspace.load ?x ?profile p | None -> Workspace.default ?x ?profile () diff --git a/test/blackbox-tests/test-cases/workspaces/run.t b/test/blackbox-tests/test-cases/workspaces/run.t index f4747357..2c509561 100644 --- a/test/blackbox-tests/test-cases/workspaces/run.t +++ b/test/blackbox-tests/test-cases/workspaces/run.t @@ -30,7 +30,7 @@ specifying the workspace file is possible: Raised by primitive operation at file "pervasives.ml", line 389, characters 28-54 Called from file "src/stdune/io.ml", line 15, characters 15-35 Called from file "src/main.ml", line 61, characters 8-36 - Called from file "src/main.ml", line 270, characters 12-56 + Called from file "src/main.ml", line 267, characters 12-56 Called from file "bin/main.ml", line 756, characters 7-29 Called from file "vendor/cmdliner/src/cmdliner_term.ml", line 27, characters 19-24 Called from file "vendor/cmdliner/src/cmdliner.ml", line 106, characters 32-39