Update ocp-indent to ocamlformat and replace action with rule stanza

proj/.ocamlformat

@@ -0,0 +1 @@
+version=0.17.0

proj/Makefile

@@ -1,6 +1,7 @@
 # Frontend to dune.
 
-.PHONY: default build install uninstall test clean
+.PHONY: default build install uninstall test clean fmt
+.IGNORE: fmt
 
 default: build
 
@@ -21,3 +22,7 @@ clean:
 # Optionally, remove all files/folders ignored by git as defined
 # in .gitignore (-X).
 	git clean -dfXq
+
+fmt:
+	dune build @fmt
+	dune promote

proj/dune-project

@@ -1,3 +1,3 @@
-(lang dune 1.0)
+(lang dune 2.8)
 (name proj)      ; optional
 (version 0.0.0)  ; optional

proj/proj.opam

@@ -25,5 +25,6 @@ run-test: ["dune" "runtest" "-p" name]
 
 depends: [
   "dune"
+  "ocamlformat" { >= "0.17.0" }
   "alcotest" {with-test}
 ]

proj/sub1/lib/a.ml

@@ -1,2 +1 @@
-let now () =
-  Unix.gettimeofday ()
+let now () = Unix.gettimeofday ()

proj/sub1/lib/a.mli

@@ -3,4 +3,4 @@
 *)
 
 val now : unit -> float
-  (** Returns the time since 1970 in seconds. *)
+(** Returns the time since 1970 in seconds. *)

proj/sub1/lib/b.ml

@@ -6,5 +6,4 @@ open Printf
 
 let do_something () =
   let unixtime = A.now () in
-  printf "%.3f seconds have elapsed since 1970-01-01T00:00:00.\n%!"
-    unixtime
+  printf "%.3f seconds have elapsed since 1970-01-01T00:00:00.\n%!" unixtime

proj/sub1/lib/dune

@@ -1,5 +1,6 @@
 ; name = name of the supermodule that will wrap all source files as submodules
 ; public_name = name of the library for ocamlfind and opam
+
 (library
  (name proj_sub1)
  (public_name proj.sub1)

proj/sub1/test/a.ml

@@ -8,6 +8,4 @@ let test_time () =
   check "now is greater than 1000" (Proj_sub1.A.now () > 1000.);
   check "now is fix" (Proj_sub1.A.now () > 1_522_882_648.)
 
-let tests = [
-  "time", `Quick, test_time;
-]
+let tests = [ ("time", `Quick, test_time) ]

proj/sub1/test/b.ml

@@ -2,13 +2,11 @@
    Tests for Sub1.B
 *)
 
-let test_string () =
-  Alcotest.(check (neg string)) "foo is not bar" "foo" "bar"
+let test_string () = Alcotest.(check (neg string)) "foo is not bar" "foo" "bar"
 
-let test_string_hasty () =
-  assert ("foo" <> "bar")
+let test_string_hasty () = assert ("foo" <> "bar")
 
-let tests = [
-  "string", `Quick, test_string;
-  "string, hasty", `Quick, test_string_hasty;
-]
+let tests =
+  [
+    ("string", `Quick, test_string); ("string, hasty", `Quick, test_string_hasty);
+  ]

proj/sub1/test/dune

@@ -1,7 +1,4 @@
 (library
  (name test_sub1)
- (libraries
-  alcotest
-  proj.sub1
- )
+ (libraries alcotest proj.sub1)
  (synopsis "Tests for sub1"))

proj/sub2/bin/bar_main.ml

@@ -1 +1,2 @@
+;;
 print_endline "Hello! The version is %%VERSION%%"

proj/sub2/bin/dune

@@ -1,10 +1,8 @@
 ; names = name of the files to compile into executables
 ; public_names = name of the executables
+
 (executables
  (names foo_main bar_main)
  (public_names sub2-foo sub2-bar)
- (libraries
-  proj.sub1
-  proj.sub2
- )
+ (libraries proj.sub1 proj.sub2)
  (package proj))

proj/sub2/bin/foo_main.ml

@@ -11,42 +11,32 @@ open Printf
    You may want to use Arg.parse_argv to read the remaining
    command-line arguments.
 *)
-let run _argv_offset =
-  Proj_sub2.A.do_something ()
+let run _argv_offset = Proj_sub2.A.do_something ()
 
-let walk _argv_offset =
-  print_endline "Nice."
+let walk _argv_offset = print_endline "Nice."
 
 (* Add your own subcommands as needed. *)
-let subcommands = [
-  "run", run;
-  "walk", walk;
-]
+let subcommands = [ ("run", run); ("walk", walk) ]
 
 let help () =
   let subcommand_names =
     String.concat "\n" (List.map (fun (name, _f) -> "  " ^ name) subcommands)
   in
-  let usage_msg = sprintf "\
-Usage: %s SUBCOMMAND [ARGS]
-where SUBCOMMAND is one of:
-%s
-
-For help on a specific subcommand, try:
-  %s SUBCOMMAND --help
-"
-    Sys.argv.(0) subcommand_names Sys.argv.(0)
+  let usage_msg =
+    sprintf
+      "Usage: %s SUBCOMMAND [ARGS]\n\
+       where SUBCOMMAND is one of:\n\
+       %s\n\n\
+       For help on a specific subcommand, try:\n\
+      \  %s SUBCOMMAND --help\n"
+      Sys.argv.(0) subcommand_names Sys.argv.(0)
   in
   eprintf "%s%!" usage_msg
 
 let dispatch_subcommand () =
   assert (Array.length Sys.argv > 1);
   match Sys.argv.(1) with
-  | "help"
-  | "-h"
-  | "-help"
-  | "--help" ->
-      help ()
+  | "help" | "-h" | "-help" | "--help" -> help ()
   | subcmd ->
       let argv_offset = 1 in
       let action =
@@ -62,10 +52,8 @@ let main () =
   let len = Array.length Sys.argv in
   if len <= 1 then (
     help ();
-    exit 1
-  )
-  else
-    dispatch_subcommand ()
+    exit 1)
+  else dispatch_subcommand ()
 
 (* Run now. *)
 let () = main ()

proj/sub2/lib/a.ml

@@ -6,5 +6,4 @@ open Printf
 
 let do_something () =
   let unixtime = Proj_sub1.A.now () in
-  printf "%.3f seconds have elapsed since 1970-01-01T00:00:00.\n%!"
-    unixtime
+  printf "%.3f seconds have elapsed since 1970-01-01T00:00:00.\n%!" unixtime

proj/sub2/lib/dune

@@ -1,9 +1,5 @@
 (library
  (name proj_sub2)
  (public_name proj.sub2)
- (libraries
-  unix
-  str
-  proj.sub1
- )
+ (libraries unix str proj.sub1)
  (synopsis "This is a short description of the sub2 library."))

proj/sub2/test/a.ml

@@ -2,5 +2,4 @@
    Tests for Sub2.A
 *)
 
-let tests = [
-]
+let tests = []

proj/sub2/test/dune

@@ -1,7 +1,4 @@
 (library
  (name test_sub2)
- (libraries
-  alcotest
-  proj.sub2
- )
+ (libraries alcotest proj.sub2)
  (synopsis "Tests for sub2"))

proj/test/dune

@@ -1,12 +1,9 @@
 (executable
  (name run_tests)
- (libraries
-  alcotest
-  test_sub1
-  test_sub2
-))
+ (libraries alcotest test_sub1 test_sub2))
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (deps run_tests.exe)
- (action (run %{deps} -q --color=always)))
+ (action
+  (run %{deps} -q --color=always)))

proj/test/run_tests.ml

@@ -2,10 +2,11 @@
    Run all the OCaml test suites defined in the project.
 *)
 
-let test_suites: unit Alcotest.test list = [
-  "Sub1.A", Test_sub1.A.tests;
-  "Sub1.B", Test_sub1.B.tests;
-  "Sub2.A", Test_sub2.A.tests;
-]
+let test_suites : unit Alcotest.test list =
+  [
+    ("Sub1.A", Test_sub1.A.tests);
+    ("Sub1.B", Test_sub1.B.tests);
+    ("Sub2.A", Test_sub2.A.tests);
+  ]
 
 let () = Alcotest.run "proj" test_suites