diff --git a/infer/src/IR/dune b/infer/src/IR/dune
index 0475c609b..79115f660 100644
--- a/infer/src/IR/dune
+++ b/infer/src/IR/dune
@@ -7,10 +7,12 @@
  (name IR)
  (public_name infer.IR)
  (flags
-  (:standard -open Core -open IStdlib -open IStd -open ATDGenerated
-    -open IBase))
+  (:standard -open Core -open IStdlib -open IStd -open ATDGenerated -open
+    IBase))
  (libraries core zarith IStdlib ATDGenerated IBase)
  (preprocess
   (pps ppx_compare)))
 
-(documentation (package infer) (mld_files IR))
+(documentation
+ (package infer)
+ (mld_files IR))
diff --git a/infer/src/Makefile b/infer/src/Makefile
index 5c6ce4576..7df9fd4f1 100644
--- a/infer/src/Makefile
+++ b/infer/src/Makefile
@@ -91,7 +91,8 @@ test: BUILD_MODE = test
 test: $(SRC_BUILD_COMMON) $(MAKEFILE_LIST)
 	$(QUIET)$(DUNE_BUILD) \
 	  $(patsubst %.exe, %.bc.exe, $(INFER_CONFIG_TARGETS)) \
-	  scripts/$(CHECKCOPYRIGHT_MAIN).bc.exe $(INFERUNIT_MAIN).bc.exe $(INFERTOP_MAIN).bc.exe
+	  scripts/$(CHECKCOPYRIGHT_MAIN).bc.exe $(INFERUNIT_MAIN).bc.exe $(INFERTOP_MAIN).bc.exe \
+	  @fmt --auto-promote
 
 .PHONY: doc
 doc: $(SRC_BUILD_COMMON) $(MAKEFILE_LIST)
diff --git a/infer/src/absint/dune b/infer/src/absint/dune
index 82baae8c1..81e6dfe00 100644
--- a/infer/src/absint/dune
+++ b/infer/src/absint/dune
@@ -10,7 +10,9 @@
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
     -open IBase))
  (libraries core IStdlib ATDGenerated IBase IR)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
 
-(documentation (package infer) (mld_files Absint))
+(documentation
+ (package infer)
+ (mld_files Absint))
diff --git a/infer/src/atd/dune b/infer/src/atd/dune
index ca440d73b..6cfbd5ff6 100644
--- a/infer/src/atd/dune
+++ b/infer/src/atd/dune
@@ -12,72 +12,79 @@
  (preprocess
   (pps ppx_compare)))
 
-(documentation (package infer) (mld_files ATDGenerated))
+(documentation
+ (package infer)
+ (mld_files ATDGenerated))
 
 ; Rules below are boilerplatey, but this is benign and very easy to
 ; understand boilerplate.
 
 ; ATD for jsonbug
+
 (rule
- (targets jsonbug_j.ml
-          jsonbug_j.mli)
- (deps    jsonbug.atd)
- (action  (run atdgen -j -j-std %{deps})))
+ (targets jsonbug_j.ml jsonbug_j.mli)
+ (deps jsonbug.atd)
+ (action
+  (run atdgen -j -j-std %{deps})))
 
 (rule
- (targets jsonbug_t.ml
-          jsonbug_t.mli)
- (deps    jsonbug.atd)
- (action  (run atdgen -t %{deps})))
+ (targets jsonbug_t.ml jsonbug_t.mli)
+ (deps jsonbug.atd)
+ (action
+  (run atdgen -t %{deps})))
 
 ; ATD for runstate
+
 (rule
- (targets runstate_j.ml
-          runstate_j.mli)
- (deps    runstate.atd)
- (action  (run atdgen -j -j-std %{deps})))
+ (targets runstate_j.ml runstate_j.mli)
+ (deps runstate.atd)
+ (action
+  (run atdgen -j -j-std %{deps})))
 
 (rule
- (targets runstate_t.ml
-          runstate_t.mli)
- (deps    runstate.atd)
- (action  (run atdgen -t %{deps})))
+ (targets runstate_t.ml runstate_t.mli)
+ (deps runstate.atd)
+ (action
+  (run atdgen -t %{deps})))
 
 ; ATD for java_method_decl
+
 (rule
- (targets java_method_decl_j.ml
-          java_method_decl_j.mli)
- (deps    java_method_decl.atd)
- (action  (run atdgen -j -j-std %{deps})))
+ (targets java_method_decl_j.ml java_method_decl_j.mli)
+ (deps java_method_decl.atd)
+ (action
+  (run atdgen -j -j-std %{deps})))
 
 (rule
- (targets java_method_decl_t.ml
-          java_method_decl_t.mli)
- (deps    java_method_decl.atd)
- (action  (run atdgen -t %{deps})))
+ (targets java_method_decl_t.ml java_method_decl_t.mli)
+ (deps java_method_decl.atd)
+ (action
+  (run atdgen -t %{deps})))
 
 ; ATD for java_profiler_samples
+
 (rule
- (targets java_profiler_samples_j.ml
-          java_profiler_samples_j.mli)
- (deps    java_profiler_samples.atd)
- (action  (run atdgen -j -j-std %{deps})))
+ (targets java_profiler_samples_j.ml java_profiler_samples_j.mli)
+ (deps java_profiler_samples.atd)
+ (action
+  (run atdgen -j -j-std %{deps})))
 
 (rule
- (targets java_profiler_samples_t.ml
-          java_profiler_samples_t.mli)
- (deps    java_profiler_samples.atd)
- (action  (run atdgen -t %{deps})))
+ (targets java_profiler_samples_t.ml java_profiler_samples_t.mli)
+ (deps java_profiler_samples.atd)
+ (action
+  (run atdgen -t %{deps})))
 
 ; ATD for clang_profiler_samples
+
 (rule
- (targets clang_profiler_samples_j.ml
-          clang_profiler_samples_j.mli)
- (deps    clang_profiler_samples.atd)
- (action  (run atdgen -j -j-std %{deps})))
+ (targets clang_profiler_samples_j.ml clang_profiler_samples_j.mli)
+ (deps clang_profiler_samples.atd)
+ (action
+  (run atdgen -j -j-std %{deps})))
 
 (rule
- (targets clang_profiler_samples_t.ml
-          clang_profiler_samples_t.mli)
- (deps    clang_profiler_samples.atd)
- (action  (run atdgen -t %{deps})))
+ (targets clang_profiler_samples_t.ml clang_profiler_samples_t.mli)
+ (deps clang_profiler_samples.atd)
+ (action
+  (run atdgen -t %{deps})))
diff --git a/infer/src/backend/dune b/infer/src/backend/dune
index 15ff2607a..18adb675e 100644
--- a/infer/src/backend/dune
+++ b/infer/src/backend/dune
@@ -7,14 +7,15 @@
  (name Backend)
  (public_name infer.Backend)
  (flags
-  (:standard
-     -open Core -open IStdlib -open IStd -open OpenSource -open ATDGenerated
-     -open IBase -open IR -open Absint -open Biabduction -open BO -open Nullsafe
-     -open Pulselib  -open Checkers -open Costlib -open Quandary -open TOPLlib
-     -open Concurrency -open Labs))
+  (:standard -open Core -open IStdlib -open IStd -open OpenSource -open
+    ATDGenerated -open IBase -open IR -open Absint -open Biabduction -open BO
+    -open Nullsafe -open Pulselib -open Checkers -open Costlib -open Quandary
+    -open TOPLlib -open Concurrency -open Labs))
  (libraries core IStdlib ATDGenerated IBase IR Absint Biabduction Nullsafe BO
-            Checkers Costlib Quandary TOPLlib Concurrency Labs)
- (preprocess (pps ppx_compare ppx_fields_conv))
-)
+   Checkers Costlib Quandary TOPLlib Concurrency Labs)
+ (preprocess
+  (pps ppx_compare ppx_fields_conv)))
 
-(documentation (package infer) (mld_files Backend))
+(documentation
+ (package infer)
+ (mld_files Backend))
diff --git a/infer/src/base/dune b/infer/src/base/dune
index c89379529..3ecb7da9d 100644
--- a/infer/src/base/dune
+++ b/infer/src/base/dune
@@ -6,14 +6,17 @@
 (library
  (name IBase)
  (public_name infer.IBase)
- (flags (:standard -open Core -open IStdlib -open IStd -open ATDGenerated -open OpenSource))
+ (flags
+  (:standard -open Core -open IStdlib -open IStd -open ATDGenerated -open
+    OpenSource))
  (libraries cmdliner core mtime.clock.os parmap re sqlite3 zip ATDGenerated
    IStdlib OpenSource)
  (preprocess
   (pps ppx_blob ppx_compare ppx_enumerate))
  (preprocessor_deps
   (glob_files ../../documentation/checkers/*.md)
-  (glob_files ../../documentation/issues/*.md))
-)
+  (glob_files ../../documentation/issues/*.md)))
 
-(documentation (package infer) (mld_files IBase))
+(documentation
+ (package infer)
+ (mld_files IBase))
diff --git a/infer/src/biabduction/dune b/infer/src/biabduction/dune
index 7c16af121..85e237312 100644
--- a/infer/src/biabduction/dune
+++ b/infer/src/biabduction/dune
@@ -10,5 +10,5 @@
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
     -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/bufferoverrun/dune b/infer/src/bufferoverrun/dune
index 7da596b13..8a3a36267 100644
--- a/infer/src/bufferoverrun/dune
+++ b/infer/src/bufferoverrun/dune
@@ -7,8 +7,8 @@
  (name BO)
  (public_name infer.BO)
  (flags
-  (:standard -open Core -open OpenSource -open IR -open IStdlib -open IStd -open ATDGenerated
-    -open IBase -open Absint -open Biabduction))
+  (:standard -open Core -open OpenSource -open IR -open IStdlib -open IStd
+    -open ATDGenerated -open IBase -open Absint -open Biabduction))
  (libraries base64 core IStdlib ATDGenerated IBase IR Absint Biabduction)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/checkers/dune b/infer/src/checkers/dune
index 928446245..5ba44f380 100644
--- a/infer/src/checkers/dune
+++ b/infer/src/checkers/dune
@@ -7,10 +7,14 @@
  (name Checkers)
  (public_name infer.Checkers)
  (flags
-  (:standard -open Core -open OpenSource -open IR -open IStdlib -open IStd -open ATDGenerated
-    -open IBase -open Absint -open Biabduction -open BO -open Pulselib))
- (libraries base64 core ocamlgraph IStdlib ATDGenerated IBase IR Absint Biabduction BO Pulselib)
- (preprocess (pps ppx_compare))
-)
+  (:standard -open Core -open OpenSource -open IR -open IStdlib -open IStd
+    -open ATDGenerated -open IBase -open Absint -open Biabduction -open BO
+    -open Pulselib))
+ (libraries base64 core ocamlgraph IStdlib ATDGenerated IBase IR Absint
+   Biabduction BO Pulselib)
+ (preprocess
+  (pps ppx_compare)))
 
-(documentation (package infer) (mld_files Checkers))
+(documentation
+ (package infer)
+ (mld_files Checkers))
diff --git a/infer/src/clang/unit/dune b/infer/src/clang/unit/dune
index 5d42cc873..68b14a86c 100644
--- a/infer/src/clang/unit/dune
+++ b/infer/src/clang/unit/dune
@@ -9,6 +9,7 @@
  (flags
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
     -open IBase -open ClangFrontend -open ASTLanguage))
- (libraries oUnit core IStdlib ATDGenerated IBase IR ClangFrontend ASTLanguage)
- (preprocess (pps ppx_compare))
-)
+ (libraries oUnit core IStdlib ATDGenerated IBase IR ClangFrontend
+   ASTLanguage)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/concurrency/dune b/infer/src/concurrency/dune
index 0c04b0186..cf93c203a 100644
--- a/infer/src/concurrency/dune
+++ b/infer/src/concurrency/dune
@@ -10,5 +10,5 @@
   (:standard -open Core -open OpenSource -open IR -open IStdlib -open IStd
     -open ATDGenerated -open IBase -open Absint))
  (libraries base64 core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/cost/dune b/infer/src/cost/dune
index f637acecb..8998f509b 100644
--- a/infer/src/cost/dune
+++ b/infer/src/cost/dune
@@ -10,5 +10,5 @@
   (:standard -open Core -open OpenSource -open IR -open IStdlib -open IStd
     -open ATDGenerated -open IBase -open Absint -open BO -open Checkers))
  (libraries core IStdlib ATDGenerated IBase IR Absint BO Checkers)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/deadcode/dune.in b/infer/src/deadcode/dune.in
index 2d1123cba..691fcdebd 100644
--- a/infer/src/deadcode/dune.in
+++ b/infer/src/deadcode/dune.in
@@ -6,10 +6,12 @@
 (executable
  (name all_infer_in_one_file)
  (modes byte)
- (flags (:standard -w +60))
+ (flags
+  (:standard -w +60))
  (libraries javalib ANSITerminal async atdgen base base64 cmdliner core
    mtime.clock.os ocamlgraph oUnit parmap re sawja sqlite3 str unix xmlm
    yojson zarith zip CStubs)
  (modules All_infer_in_one_file)
- (preprocess (pps ppx_blob ppx_compare ppx_enumerate ppx_fields_conv ppx_hash ppx_sexp_conv ppx_variants_conv -no-check))
-)
+ (preprocess
+  (pps ppx_blob ppx_compare ppx_enumerate ppx_fields_conv ppx_hash
+    ppx_sexp_conv ppx_variants_conv -no-check)))
diff --git a/infer/src/istd/dune b/infer/src/istd/dune
index 6fc4c02a1..b7f643fec 100644
--- a/infer/src/istd/dune
+++ b/infer/src/istd/dune
@@ -12,4 +12,6 @@
  (preprocess
   (pps ppx_compare)))
 
-(documentation (package infer) (mld_files IStdlib))
+(documentation
+ (package infer)
+ (mld_files IStdlib))
diff --git a/infer/src/labs/00_dummy_checker/dune b/infer/src/labs/00_dummy_checker/dune
index 66e213c54..da66f807c 100644
--- a/infer/src/labs/00_dummy_checker/dune
+++ b/infer/src/labs/00_dummy_checker/dune
@@ -7,7 +7,7 @@
  (name Labs00)
  (flags
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
-     -open IBase -open Absint))
+    -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/labs/01_integer_domain/dune b/infer/src/labs/01_integer_domain/dune
index 5cab37515..2d30c1467 100644
--- a/infer/src/labs/01_integer_domain/dune
+++ b/infer/src/labs/01_integer_domain/dune
@@ -7,7 +7,7 @@
  (name Labs01)
  (flags
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
-     -open IBase -open Absint))
+    -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/labs/02_domain_join/dune b/infer/src/labs/02_domain_join/dune
index 79b3a35ca..149a9ac96 100644
--- a/infer/src/labs/02_domain_join/dune
+++ b/infer/src/labs/02_domain_join/dune
@@ -7,7 +7,7 @@
  (name Labs02)
  (flags
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
-     -open IBase -open Absint))
+    -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/labs/03_domain_top/dune b/infer/src/labs/03_domain_top/dune
index 00ca51a45..40741f5fb 100644
--- a/infer/src/labs/03_domain_top/dune
+++ b/infer/src/labs/03_domain_top/dune
@@ -7,7 +7,7 @@
  (name Labs03)
  (flags
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
-     -open IBase -open Absint))
+    -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/labs/04_interprocedural/dune b/infer/src/labs/04_interprocedural/dune
index 9d3cd4421..c9cb107ae 100644
--- a/infer/src/labs/04_interprocedural/dune
+++ b/infer/src/labs/04_interprocedural/dune
@@ -7,7 +7,7 @@
  (name Labs04)
  (flags
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
-     -open IBase -open Absint))
+    -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/labs/05_access_paths_interprocedural/dune b/infer/src/labs/05_access_paths_interprocedural/dune
index 94ced83d2..3f21fb76a 100644
--- a/infer/src/labs/05_access_paths_interprocedural/dune
+++ b/infer/src/labs/05_access_paths_interprocedural/dune
@@ -7,7 +7,7 @@
  (name Labs05)
  (flags
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
-     -open IBase -open Absint))
+    -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/labs/dune b/infer/src/labs/dune
index 6f81f41fe..6305e9908 100644
--- a/infer/src/labs/dune
+++ b/infer/src/labs/dune
@@ -8,7 +8,7 @@
  (public_name infer.Labs)
  (flags
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
-     -open IBase -open Absint))
+    -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/nullsafe/dune b/infer/src/nullsafe/dune
index 4588a8d51..eafd20759 100644
--- a/infer/src/nullsafe/dune
+++ b/infer/src/nullsafe/dune
@@ -10,7 +10,9 @@
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
     -open IBase -open Absint -open Biabduction))
  (libraries core IStdlib ATDGenerated IBase IR Absint Biabduction)
- (preprocess (pps ppx_compare ppx_sexp_conv))
-)
+ (preprocess
+  (pps ppx_compare ppx_sexp_conv)))
 
-(documentation (package infer) (mld_files Nullsafe))
+(documentation
+ (package infer)
+ (mld_files Nullsafe))
diff --git a/infer/src/nullsafe/unit/dune b/infer/src/nullsafe/unit/dune
index 2a28cfe88..3ad73fc78 100644
--- a/infer/src/nullsafe/unit/dune
+++ b/infer/src/nullsafe/unit/dune
@@ -10,5 +10,5 @@
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
     -open IBase -open Nullsafe))
  (libraries oUnit core IStdlib ATDGenerated IBase IR Nullsafe)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/pulse/dune b/infer/src/pulse/dune
index 1f4335d8d..c71918d0d 100644
--- a/infer/src/pulse/dune
+++ b/infer/src/pulse/dune
@@ -10,5 +10,5 @@
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
     -open IBase -open Absint -open BO))
  (libraries core IStdlib ATDGenerated IBase IR Absint BO)
- (preprocess (pps ppx_compare ppx_variants_conv))
-)
+ (preprocess
+  (pps ppx_compare ppx_variants_conv)))
diff --git a/infer/src/quandary/dune b/infer/src/quandary/dune
index 98da76566..2a4f49fc9 100644
--- a/infer/src/quandary/dune
+++ b/infer/src/quandary/dune
@@ -10,5 +10,5 @@
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
     -open IBase -open Absint))
  (libraries core IStdlib ATDGenerated IBase IR Absint)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
diff --git a/infer/src/test_determinator/dune b/infer/src/test_determinator/dune
index a9f591513..5acb48e56 100644
--- a/infer/src/test_determinator/dune
+++ b/infer/src/test_determinator/dune
@@ -7,11 +7,12 @@
  (name TestDeterminators)
  (public_name infer.TestDeterminators)
  (flags
-  (:standard
-     -open Core -open IStdlib -open IStd -open OpenSource -open ATDGenerated
-     -open IBase -open IR -open CStubs))
+  (:standard -open Core -open IStdlib -open IStd -open OpenSource -open
+    ATDGenerated -open IBase -open IR -open CStubs))
  (libraries core IStdlib ATDGenerated IBase IR CStubs)
- (preprocess (pps ppx_compare))
-)
+ (preprocess
+  (pps ppx_compare)))
 
-(documentation (package infer) (mld_files TestDeterminators))
+(documentation
+ (package infer)
+ (mld_files TestDeterminators))
diff --git a/infer/src/topl/dune b/infer/src/topl/dune
index 5b235c9c6..d21b9f4ac 100644
--- a/infer/src/topl/dune
+++ b/infer/src/topl/dune
@@ -5,7 +5,9 @@
 
 (ocamllex ToplLexer)
 
-(menhir (flags --unused-token INDENT --explain) (modules ToplParser))
+(menhir
+ (flags --unused-token INDENT --explain)
+ (modules ToplParser))
 
 (library
  (name TOPLlib)
@@ -14,5 +16,5 @@
   (:standard -open Core -open IR -open IStdlib -open IStd -open ATDGenerated
     -open IBase -open Absint -open Biabduction -open Pulselib))
  (libraries core IStdlib ATDGenerated IBase IR Absint Biabduction Pulselib)
- (preprocess (pps ppx_compare ppx_hash ppx_sexp_conv))
-)
+ (preprocess
+  (pps ppx_compare ppx_hash ppx_sexp_conv)))