Merge pull request #19 from mbarbin/pp-log

Upgrade to pp-log
mbarbin · Nov 10, 2024 · fb6ec39 · fb6ec39
2 parents bcc8b80 + 24af6df
commit fb6ec39
Show file tree

Hide file tree

Showing 38 changed files with 109 additions and 151 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,8 +1,12 @@
 name: ci
 
 on:
-  - pull_request
-  - push
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "**" # This will match pull requests targeting any branch
 
 jobs:
   build:
@@ -33,8 +37,8 @@ jobs:
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git
-#           janestreet-bleeding: https://github.com/janestreet/opam-repository.git
-#           janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
+      #     janestreet-bleeding: https://github.com/janestreet/opam-repository.git
+      #     janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
       - name: Install dependencies
         run: opam install . --deps-only --with-doc --with-test --with-dev-setup

diff --git a/bopkit-tests.opam b/bopkit-tests.opam
@@ -13,30 +13,29 @@ depends: [
   "ocamlformat" {with-dev-setup & = "0.26.2"}
   "ANSITerminal" {>= "0.8.3"}
   "appendable-list" {>= "v0.17" & < "v0.18"}
-  "auto-format" {>= "0.0.13"}
+  "auto-format" {>= "0.0.14"}
   "base" {>= "v0.17" & < "v0.18"}
   "base_quickcheck" {>= "v0.17" & < "v0.18"}
   "bopkit" {= version}
   "cmdlang" {>= "0.0.5"}
   "cmdlang-cmdliner-runner" {>= "0.0.5"}
   "cmdlang-to-cmdliner" {>= "0.0.5"}
-  "cmdliner" {= "1.3.0"}
-  "comments-parser" {>= "0.2.1"}
+  "cmdliner" {>= "1.3.0"}
+  "comments-parser" {>= "0.2.2"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.5"}
-  "err-cli" {>= "0.0.5"}
   "expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
   "fpath" {>= "0.7.3"}
-  "fpath-base" {>= "0.2.0"}
+  "fpath-base" {>= "0.2.2"}
   "graphics" {>= "5.1.2"}
   "loc" {>= "0.2.0"}
   "mdx" {>= "2.4"}
   "menhir" {>= "20220210"}
-  "parsing-utils" {>= "0.2.1"}
+  "parsing-utils" {>= "0.2.2"}
   "pp" {>= "1.2.0"}
   "pp-extended" {>= "0.0.2"}
+  "pp-log" {>= "0.0.7"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "v0.17" & < "v0.18"}
   "ppx_expect" {>= "v0.17" & < "v0.18"}

diff --git a/bopkit.opam b/bopkit.opam
@@ -12,28 +12,27 @@ depends: [
   "ocaml" {>= "5.2"}
   "ANSITerminal" {>= "0.8.3"}
   "appendable-list" {>= "v0.17" & < "v0.18"}
-  "auto-format" {>= "0.0.13"}
+  "auto-format" {>= "0.0.14"}
   "base" {>= "v0.17" & < "v0.18"}
   "base_quickcheck" {>= "v0.17" & < "v0.18"}
   "cmdlang" {>= "0.0.5"}
   "cmdlang-cmdliner-runner" {>= "0.0.5"}
   "cmdlang-to-cmdliner" {>= "0.0.5"}
-  "cmdliner" {= "1.3.0"}
-  "comments-parser" {>= "0.2.1"}
+  "cmdliner" {>= "1.3.0"}
+  "comments-parser" {>= "0.2.2"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.5"}
-  "err-cli" {>= "0.0.5"}
   "fpath" {>= "0.7.3"}
-  "fpath-base" {>= "0.2.0"}
+  "fpath-base" {>= "0.2.2"}
   "graphics" {>= "5.1.2"}
   "loc" {>= "0.2.0"}
   "mdx" {>= "2.4"}
   "menhir" {>= "20220210"}
-  "parsing-utils" {>= "0.2.1"}
+  "parsing-utils" {>= "0.2.2"}
   "pp" {>= "1.2.0"}
   "pp-extended" {>= "0.0.2"}
+  "pp-log" {>= "0.0.7"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "v0.17" & < "v0.18"}
   "ppx_fields_conv" {>= "v0.17" & < "v0.18"}

diff --git a/dune-project b/dune-project
@@ -40,7 +40,7 @@
     (>= v0.17)
     (< v0.18)))
   (auto-format
-   (>= 0.0.13))
+   (>= 0.0.14))
   (base
    (and
     (>= v0.17)
@@ -56,9 +56,9 @@
   (cmdlang-to-cmdliner
    (>= 0.0.5))
   (cmdliner
-   (= 1.3.0))
+   (>= 1.3.0))
   (comments-parser
-   (>= 0.2.1))
+   (>= 0.2.2))
   (core
    (and
     (>= v0.17)
@@ -69,14 +69,10 @@
     (< v0.18)))
   (dune-site
    (>= 3.16))
-  (err
-   (>= 0.0.5))
-  (err-cli
-   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
-   (>= 0.2.0))
+   (>= 0.2.2))
   (graphics
    (>= 5.1.2))
   (loc
@@ -86,11 +82,13 @@
   (menhir
    (>= 20220210))
   (parsing-utils
-   (>= 0.2.1))
+   (>= 0.2.2))
   (pp
    (>= 1.2.0))
   (pp-extended
    (>= 0.0.2))
+  (pp-log
+   (>= 0.0.7))
   (ppx_compare
    (and
     (>= v0.17)
@@ -149,7 +147,7 @@
     (>= v0.17)
     (< v0.18)))
   (auto-format
-   (>= 0.0.13))
+   (>= 0.0.14))
   (base
    (and
     (>= v0.17)
@@ -167,7 +165,7 @@
   (cmdlang-to-cmdliner
    (>= 0.0.5))
   (cmdliner
-   (= 1.3.0))
+   (>= 1.3.0))
   (core
    (and
     (>= v0.17)
@@ -178,14 +176,10 @@
     (< v0.18)))
   (dune-site
    (>= 3.16))
-  (err
-   (>= 0.0.5))
-  (err-cli
-   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
-   (>= 0.2.0))
+   (>= 0.2.2))
   (graphics
    (>= 5.1.2))
   (loc
@@ -195,11 +189,13 @@
   (menhir
    (>= 20220210))
   (parsing-utils
-   (>= 0.2.1))
+   (>= 0.2.2))
   (pp
    (>= 1.2.0))
   (pp-extended
    (>= 0.0.2))
+  (pp-log
+   (>= 0.0.7))
   (ppx_compare
    (and
     (>= v0.17)
@@ -254,7 +250,7 @@
     (>= v0.17)
     (< v0.18)))
   (auto-format
-   (>= 0.0.13))
+   (>= 0.0.14))
   (base
    (and
     (>= v0.17)
@@ -272,7 +268,7 @@
   (cmdlang-to-cmdliner
    (>= 0.0.5))
   (cmdliner
-   (= 1.3.0))
+   (>= 1.3.0))
   (core
    (and
     (>= v0.17)
@@ -283,14 +279,10 @@
     (< v0.18)))
   (dune-site
    (>= 3.16))
-  (err
-   (>= 0.0.5))
-  (err-cli
-   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
-   (>= 0.2.0))
+   (>= 0.2.2))
   (graphics
    (>= 5.1.2))
   (loc
@@ -300,11 +292,13 @@
   (menhir
    (>= 20220210))
   (parsing-utils
-   (>= 0.2.1))
+   (>= 0.2.2))
   (pp
    (>= 1.2.0))
   (pp-extended
    (>= 0.0.2))
+  (pp-log
+   (>= 0.0.7))
   (ppx_compare
    (and
     (>= v0.17)
@@ -363,7 +357,7 @@
     (>= v0.17)
     (< v0.18)))
   (auto-format
-   (>= 0.0.13))
+   (>= 0.0.14))
   (base
    (and
     (>= v0.17)
@@ -381,9 +375,9 @@
   (cmdlang-to-cmdliner
    (>= 0.0.5))
   (cmdliner
-   (= 1.3.0))
+   (>= 1.3.0))
   (comments-parser
-   (>= 0.2.1))
+   (>= 0.2.2))
   (core
    (and
     (>= v0.17)
@@ -394,18 +388,14 @@
     (< v0.18)))
   (dune-site
    (>= 3.16))
-  (err
-   (>= 0.0.5))
-  (err-cli
-   (>= 0.0.5))
   (expect_test_helpers_core
    (and
     (>= v0.17)
     (< v0.18)))
   (fpath
    (>= 0.7.3))
   (fpath-base
-   (>= 0.2.0))
+   (>= 0.2.2))
   (graphics
    (>= 5.1.2))
   (loc
@@ -415,11 +405,13 @@
   (menhir
    (>= 20220210))
   (parsing-utils
-   (>= 0.2.1))
+   (>= 0.2.2))
   (pp
    (>= 1.2.0))
   (pp-extended
    (>= 0.0.2))
+  (pp-log
+   (>= 0.0.7))
   (ppx_compare
    (and
     (>= v0.17)

diff --git a/lib/bopkit/src/dune b/lib/bopkit/src/dune
@@ -19,12 +19,12 @@
   bit_utils
   cmdlang
   comments-parser
-  err
   fpath
   fpath-base
   loc
   parsing-utils
-  pp)
+  pp
+  pp-log.err)
  (lint
   (pps ppx_js_style -check-doc-comments))
  (preprocess

diff --git a/lib/bopkit_bdd_command/src/dune b/lib/bopkit_bdd_command/src/dune
@@ -14,8 +14,6 @@
   -open
   Stdio
   -open
-  Or_error.Let_syntax
-  -open
   Cmdlang)
  (libraries
   base

diff --git a/lib/bopkit_block/src/bopkit_block.ml b/lib/bopkit_block/src/bopkit_block.ml
@@ -1,6 +1,5 @@
 open! Base
 open! Stdio
-open! Or_error.Let_syntax
 
 module Arity = struct
   type ('kind, 'signal) t =
@@ -197,7 +196,7 @@ let run_line
   ~line
   =
   let output = create_output t.output_arity in
-  let%map () =
+  let%map.Or_error () =
     try
       let input = create_input t.input_arity ~line in
       t.f ~arguments ~input ~output;

diff --git a/lib/bopkit_circuit/src/dune b/lib/bopkit_circuit/src/dune
@@ -8,8 +8,8 @@
   bopkit
   bopkit_sites
   core ;; For [Core.Set_once]
-  err
-  loc)
+  loc
+  pp-log.err)
  (lint
   (pps ppx_js_style -check-doc-comments))
  (preprocess

diff --git a/lib/bopkit_command/src/cmd_bop2c.ml b/lib/bopkit_command/src/cmd_bop2c.ml
@@ -7,7 +7,7 @@ let main =
          (Param.validated_string (module Fpath))
          ~docv:"FILE"
          ~doc:"target file"
-     and () = Err_cli.set_config ()
+     and () = Pp_log_cli.set_config ()
      and bopkit_compiler_config = Bopkit_compiler.Config.arg in
      let circuit =
        Bopkit_compiler.circuit_of_netlist ~path ~config:bopkit_compiler_config

diff --git a/lib/bopkit_command/src/cmd_check.ml b/lib/bopkit_command/src/cmd_check.ml
@@ -7,7 +7,7 @@ let main =
          (Param.validated_string (module Fpath))
          ~docv:"FILE"
          ~doc:"file to check"
-     and () = Err_cli.set_config ()
+     and () = Pp_log_cli.set_config ()
      and print_cds =
        Arg.flag [ "print-cds" ] ~doc:"print the cds out stdout in case of success"
      and bopkit_compiler_config = Bopkit_compiler.Config.arg in

diff --git a/lib/bopkit_command/src/cmd_simu.ml b/lib/bopkit_command/src/cmd_simu.ml
@@ -7,7 +7,7 @@ let main =
          (Param.validated_string (module Fpath))
          ~docv:"FILE"
          ~doc:"file to simulate"
-     and () = Err_cli.set_config ()
+     and () = Pp_log_cli.set_config ()
      and bopkit_compiler_config = Bopkit_compiler.Config.arg
      and bopkit_simulator_config = Bopkit_simulator.Config.arg in
      let circuit =