Enable formatting of dune files

Signed-off-by: Nathan Rebours <[email protected]>

ast/dune

@@ -3,28 +3,31 @@
 ;; (per_module <action> <module_list>)
 
 (library
- (name        ppxlib_ast)
+ (name ppxlib_ast)
  (public_name ppxlib.ast)
- (libraries
-  ocaml-compiler-libs.shadow
-  ocaml-compiler-libs.common
-  compiler-libs.common
-  ocaml-migrate-parsetree
-  stdlib-shims)
- (flags (:standard -open Ocaml_shadow -safe-string) -w -9-27-32)
+ (libraries ocaml-compiler-libs.shadow ocaml-compiler-libs.common
+   compiler-libs.common ocaml-migrate-parsetree stdlib-shims)
+ (flags
+  (:standard -open Ocaml_shadow -safe-string)
+  -w
+  -9-27-32)
  (preprocess
   (per_module
-    ((action (run %{exe:pp/pp.exe} %{ocaml_version} %{input-file}))
-     versions
-     location_error)))
- (lint (pps ppxlib_traverse -deriving-keep-w32=impl)))
+   ((action
+     (run %{exe:pp/pp.exe} %{ocaml_version} %{input-file}))
+    versions
+    location_error)))
+ (lint
+  (pps ppxlib_traverse -deriving-keep-w32=impl)))
 
 ;; This is to make the code compatible with different versions of
 ;; OCaml
+
 (rule
  (targets location_helper.ml clflags_helper.ml misc_helper.ml)
- (deps    gen-compiler_specifics)
- (action  (run %{ocaml} %{deps} %{ocaml_version} %{targets})))
+ (deps gen-compiler_specifics)
+ (action
+  (run %{ocaml} %{deps} %{ocaml_version} %{targets})))
 
 (cinaps
  (files *.ml *.mli)

dune

@@ -5,4 +5,5 @@
 
 (alias
  (name runtest)
- (deps (alias_rec lint)))
+ (deps
+  (alias_rec lint)))

dune-project

@@ -2,7 +2,7 @@
 (name ppxlib)
 (using cinaps 1.0)
 (allow_approximate_merlin)
-(formatting disabled)
+(formatting (enabled_for dune))
 (cram enable)
 (generate_opam_files true)
 

examples/dune

@@ -1,3 +1,4 @@
 (alias
  (name runtest)
- (deps (alias_rec all)))
+ (deps
+  (alias_rec all)))

metaquot/dune

@@ -1,9 +1,7 @@
 (library
- (name        ppxlib_metaquot)
+ (name ppxlib_metaquot)
  (public_name ppxlib.metaquot)
  (kind ppx_rewriter)
- (flags (:standard -safe-string))
- (libraries
-  ppxlib
-  ppxlib_traverse_builtins
-  ppxlib_metaquot_lifters))
+ (flags
+  (:standard -safe-string))
+ (libraries ppxlib ppxlib_traverse_builtins ppxlib_metaquot_lifters))

metaquot_lifters/dune

@@ -1,5 +1,6 @@
 (library
- (name        ppxlib_metaquot_lifters)
+ (name ppxlib_metaquot_lifters)
  (public_name ppxlib.metaquot_lifters)
- (flags (:standard -safe-string))
- (libraries   ppxlib ppxlib_traverse_builtins))
+ (flags
+  (:standard -safe-string))
+ (libraries ppxlib ppxlib_traverse_builtins))

print-diff/dune

@@ -1,4 +1,5 @@
 (library
  (name ppxlib_print_diff)
  (public_name ppxlib.print_diff)
- (flags (:standard -safe-string)))
+ (flags
+  (:standard -safe-string)))

runner/dune

@@ -2,8 +2,9 @@
 ;; be linked after all other libraries and units.
 
 (library
- (name          ppxlib_runner)
- (public_name   ppxlib.runner)
- (flags (:standard -safe-string))
- (libraries     ppxlib)
+ (name ppxlib_runner)
+ (public_name ppxlib.runner)
+ (flags
+  (:standard -safe-string))
+ (libraries ppxlib)
  (library_flags -linkall))

runner_as_ppx/dune

@@ -1,8 +1,10 @@
 ;; This library just contain the entry point for ppx drivers. It must
 ;; be linked after all other libraries and units.
+
 (library
  (name ppxlib_runner_as_ppx)
  (public_name ppxlib.runner_as_ppx)
  (library_flags -linkall)
- (flags (:standard -safe-string))
+ (flags
+  (:standard -safe-string))
  (libraries ppxlib))

src/dune

@@ -1,38 +1,39 @@
 (library
  (name ppxlib)
  (public_name ppxlib)
- (libraries
-  ocaml-compiler-libs.common
-  compiler-libs.common
-  ocaml-compiler-libs.shadow
-  ppxlib_ast
-  ppxlib_print_diff
-  ppx_derivers
-  ppxlib_traverse_builtins
-  stdppx)
- (flags (:standard -open Ocaml_shadow -safe-string))
+ (libraries ocaml-compiler-libs.common compiler-libs.common
+   ocaml-compiler-libs.shadow ppxlib_ast ppxlib_print_diff ppx_derivers
+   ppxlib_traverse_builtins stdppx)
+ (flags
+  (:standard -open Ocaml_shadow -safe-string))
  (ppx.driver
-  (main       Ppxlib.Driver.standalone)
-  (flags      (-corrected-suffix %{corrected-suffix} -diff-cmd - -dump-ast))
-  (lint_flags (-corrected-suffix %{corrected-suffix} -diff-cmd - -null    ))))
+  (main Ppxlib.Driver.standalone)
+  (flags
+   (-corrected-suffix %{corrected-suffix} -diff-cmd - -dump-ast))
+  (lint_flags
+   (-corrected-suffix %{corrected-suffix} -diff-cmd - -null))))
 
 (cinaps
  (files *.ml *.mli)
  (libraries ppxlib_cinaps_helpers))
 
 (rule
  (targets ast_pattern_generated.ml)
- (deps    gen/gen_ast_pattern.exe)
- (action  (run ./gen/gen_ast_pattern.exe %{lib:ppxlib.ast:ast.ml})))
+ (deps gen/gen_ast_pattern.exe)
+ (action
+  (run ./gen/gen_ast_pattern.exe %{lib:ppxlib.ast:ast.ml})))
 
 (rule
  (targets ast_builder_generated.ml)
  (deps gen/gen_ast_builder.exe)
- (action  (run ./gen/gen_ast_builder.exe %{lib:ppxlib.ast:ast.ml})))
+ (action
+  (run ./gen/gen_ast_builder.exe %{lib:ppxlib.ast:ast.ml})))
 
 ;; This is to make the code compatible with different versions of
 ;; OCaml
+
 (rule
  (targets compiler_specifics.ml)
- (deps    gen-compiler_specifics)
- (action  (run %{ocaml} %{deps} %{ocaml_version} %{targets})))
+ (deps gen-compiler_specifics)
+ (action
+  (run %{ocaml} %{deps} %{ocaml_version} %{targets})))

src/gen/dune

@@ -1,9 +1,6 @@
 (executables
  (names gen_ast_pattern gen_ast_builder)
- (flags (:standard -safe-string))
- (libraries
-  ppxlib_ast
-  compiler-libs.common
-  compiler-libs.bytecomp
-  ppxlib_traverse_builtins
-  stdppx))
+ (flags
+  (:standard -safe-string))
+ (libraries ppxlib_ast compiler-libs.common compiler-libs.bytecomp
+   ppxlib_traverse_builtins stdppx))

stdppx/dune

@@ -1,8 +1,6 @@
 (library
  (name stdppx)
  (public_name ppxlib.stdppx)
- (libraries
-  ocaml-compiler-libs.shadow
-  sexplib0
-  stdlib-shims)
- (flags (:standard -open Ocaml_shadow -safe-string)))
+ (libraries ocaml-compiler-libs.shadow sexplib0 stdlib-shims)
+ (flags
+  (:standard -open Ocaml_shadow -safe-string)))

test/base/dune

@@ -1,10 +1,13 @@
 (rule
  (alias runtest)
- (enabled_if (>= %{ocaml_version} "4.09.0"))
+ (enabled_if
+  (>= %{ocaml_version} "4.09.0"))
  (deps
   (:test test.ml)
   (package ppxlib))
- (action (chdir %{project_root}
-          (progn
-           (run expect-test %{test})
-           (diff? %{test} %{test}.corrected)))))
+ (action
+  (chdir
+   %{project_root}
+   (progn
+    (run expect-test %{test})
+    (diff? %{test} %{test}.corrected)))))

test/code_path/dune

@@ -1,10 +1,13 @@
 (rule
  (alias runtest)
- (enabled_if (>= %{ocaml_version} "4.08.0"))
+ (enabled_if
+  (>= %{ocaml_version} "4.08.0"))
  (deps
   (:test test.ml)
   (package ppxlib))
- (action (chdir %{project_root}
-          (progn
-           (run expect-test %{test})
-           (diff? %{test} %{test}.corrected)))))
+ (action
+  (chdir
+   %{project_root}
+   (progn
+    (run expect-test %{test})
+    (diff? %{test} %{test}.corrected)))))

test/deriving/dune

@@ -1,10 +1,13 @@
 (rule
  (alias runtest)
- (enabled_if (>= %{ocaml_version} "4.10.0"))
+ (enabled_if
+  (>= %{ocaml_version} "4.10.0"))
  (deps
   (:test test.ml)
   (package ppxlib))
- (action (chdir %{project_root}
-          (progn
-           (run expect-test %{test})
-           (diff? %{test} %{test}.corrected)))))
+ (action
+  (chdir
+   %{project_root}
+   (progn
+    (run expect-test %{test})
+    (diff? %{test} %{test}.corrected)))))

test/deriving/inline/example/dune

@@ -1,9 +1,8 @@
 (library
-  (name ppx_deriving_example)
-  (preprocess (pps ppx_foo_deriver))
-)
+ (name ppx_deriving_example)
+ (preprocess
+  (pps ppx_foo_deriver)))
 
 (alias
-  (name runtest)
-  (deps ppx_deriving_example.cma)
-  )
+ (name runtest)
+ (deps ppx_deriving_example.cma))

test/deriving/inline/foo-deriver/dune

@@ -1,5 +1,4 @@
 (library
-  (kind ppx_deriver)
-  (name ppx_foo_deriver)
-  (libraries ppxlib)
-)
+ (kind ppx_deriver)
+ (name ppx_foo_deriver)
+ (libraries ppxlib))

test/driver/attributes/dune

@@ -1,10 +1,13 @@
 (rule
  (alias runtest)
- (enabled_if (>= %{ocaml_version} "4.08.0"))
+ (enabled_if
+  (>= %{ocaml_version} "4.08.0"))
  (deps
   (:test test.ml)
   (package ppxlib))
- (action (chdir %{project_root}
-          (progn
-           (run expect-test %{test})
-           (diff? %{test} %{test}.corrected)))))
+ (action
+  (chdir
+   %{project_root}
+   (progn
+    (run expect-test %{test})
+    (diff? %{test} %{test}.corrected)))))

test/driver/instrument/dune

@@ -1,10 +1,13 @@
 (rule
-   (alias runtest)
-   (enabled_if (>= %{ocaml_version} "4.08.0"))
-   (deps
-      (:test test.ml)
-      (package ppxlib))
-   (action (chdir %{project_root}
-                     (progn
-                        (run expect-test %{test})
-                        (diff? %{test} %{test}.corrected)))))
+ (alias runtest)
+ (enabled_if
+  (>= %{ocaml_version} "4.08.0"))
+ (deps
+  (:test test.ml)
+  (package ppxlib))
+ (action
+  (chdir
+   %{project_root}
+   (progn
+    (run expect-test %{test})
+    (diff? %{test} %{test}.corrected)))))

test/driver/non-compressible-suffix/dune

@@ -1,10 +1,13 @@
 (rule
  (alias runtest)
- (enabled_if (>= %{ocaml_version} "4.08.0"))
+ (enabled_if
+  (>= %{ocaml_version} "4.08.0"))
  (deps
   (:test test.ml)
   (package ppxlib))
- (action (chdir %{project_root}
-          (progn
-           (run expect-test %{test})
-           (diff? %{test} %{test}.corrected)))))
+ (action
+  (chdir
+   %{project_root}
+   (progn
+    (run expect-test %{test})
+    (diff? %{test} %{test}.corrected)))))

test/driver/skip-hash-bang/dune

@@ -7,5 +7,7 @@
 (test
  (name test)
  (modules test)
- (flags (:standard -safe-string))
- (preprocess (pps empty_rewriter)))
+ (flags
+  (:standard -safe-string))
+ (preprocess
+  (pps empty_rewriter)))

test/driver/transformations/dune

@@ -7,7 +7,9 @@
  (deps
   (:test test.ml)
   (package ppxlib))
- (action (chdir %{project_root}
-          (progn
-           (run expect-test %{test})
-           (diff? %{test} %{test}.corrected)))))
+ (action
+  (chdir
+   %{project_root}
+   (progn
+    (run expect-test %{test})
+    (diff? %{test} %{test}.corrected)))))