chore: update fmt with new dune rules

Signed-off-by: Etienne Marais <[email protected]>

bench/dune

@@ -1,15 +1,8 @@
 (executable
  (name bench)
  (modules bench metrics)
- (libraries
-  dune_stats
-  dune_console
-  chrome_trace
-  stdune
-  fiber
-  dune_lang
-  dune_engine
-  dune_util))
+ (libraries dune_stats dune_console chrome_trace stdune fiber dune_lang
+  dune_engine dune_util))
 
 (rule
  (alias bench)

src/dune_cache/dune

@@ -1,15 +1,7 @@
 (library
  (name dune_cache)
  (synopsis "[Internal] Dune's local and cloud build cache")
- (libraries
-  csexp
-  dune_digest
-  dune_cache_storage
-  dune_util
-  dune_console
-  dune_targets
-  fiber
-  stdune
-  unix)
+ (libraries csexp dune_digest dune_cache_storage dune_util dune_console
+  dune_targets fiber stdune unix)
  (instrumentation
   (backend bisect_ppx)))

src/dune_config_file/dune

@@ -1,20 +1,8 @@
 (library
  (name dune_config_file)
- (libraries
-  stdune
-  xdg
-  dune_config
-  dune_console
-  dune_threaded_console
-  dune_lang
-  dune_cache
-  dune_cache_storage
-  dune_engine
-  dune_rpc_private
-  dune_stats
-  dune_tui
-  dune_util
-  spawn)
+ (libraries stdune xdg dune_config dune_console dune_threaded_console
+  dune_lang dune_cache dune_cache_storage dune_engine dune_rpc_private
+  dune_stats dune_tui dune_util spawn)
  (synopsis "Internal Dune library, do not use!")
  (instrumentation
   (backend bisect_ppx)))

src/dune_engine/dune

@@ -2,38 +2,12 @@
 
 (library
  (name dune_engine)
- (libraries
-  unix
-  csexp
-  stdune
-  dune_config
-  dune_console
-  dyn
-  fiber
-  memo
-  dune_async_io
-  threads.posix
-  predicate_lang
-  dune_cache
-  dune_cache_storage
-  dune_glob
-  dune_targets
-  chrome_trace
-  dune_stats
-  dune_action_plugin
-  dune_util
-  build_path_prefix_map
-  dune_output_truncation
-  csexp_rpc
-  dune_rpc_private
-  dune_rpc_client
-  dune_thread_pool
-  spawn
-  ocamlc_loc
-  dune_file_watcher
-  dune_filesystem_stubs
-  dune_digest
-  dune_metrics)
+ (libraries unix csexp stdune dune_config dune_console dyn fiber memo
+  dune_async_io threads.posix predicate_lang dune_cache dune_cache_storage
+  dune_glob dune_targets chrome_trace dune_stats dune_action_plugin dune_util
+  build_path_prefix_map dune_output_truncation csexp_rpc dune_rpc_private
+  dune_rpc_client dune_thread_pool spawn ocamlc_loc dune_file_watcher
+  dune_filesystem_stubs dune_digest dune_metrics)
  (synopsis "Internal Dune library, do not use!")
  (instrumentation
   (backend bisect_ppx)))

src/dune_file_watcher/dune

@@ -1,16 +1,7 @@
 (library
  (name dune_file_watcher)
- (libraries
-  spawn
-  fsevents
-  dune_console
-  unix
-  stdune
-  threads.posix
-  ocaml_inotify
-  async_inotify_for_dune
-  dune_re
-  fswatch_win)
+ (libraries spawn fsevents dune_console unix stdune threads.posix
+  ocaml_inotify async_inotify_for_dune dune_re fswatch_win)
  (synopsis "Internal Dune library, do not use!")
  (instrumentation
   (backend bisect_ppx)))

src/dune_pkg/dune

@@ -1,24 +1,8 @@
 (library
  (name dune_pkg)
  (synopsis "[Internal] Dune's packaging support")
- (libraries
-  stdune
-  fiber
-  fiber_util
-  chrome_trace
-  dune_engine
-  dune_digest
-  dune_util
-  dune_stats
-  dune_lang
-  dune_console
-  dune_re
-  dune_vcs
-  dune_config
-  opam_core
-  opam_format
-  build_info
-  sat
-  xdg)
+ (libraries stdune fiber fiber_util chrome_trace dune_engine dune_digest
+  dune_util dune_stats dune_lang dune_console dune_re dune_vcs dune_config
+  opam_core opam_format build_info sat xdg)
  (instrumentation
   (backend bisect_ppx)))

src/dune_pkg/opam_solver.ml

@@ -135,8 +135,8 @@ module Context = struct
          let packages pkg (formula : OpamTypes.formula) =
            OpamFormula.iter
              (fun (name, _) ->
-               let name = Package_name.of_opam_package_name name in
-               Table.Multi.cons acc name pkg)
+                let name = Package_name.of_opam_package_name name in
+                Table.Multi.cons acc name pkg)
              formula
          in
          Lazy.force local_packages

src/dune_rpc_impl/dune

@@ -1,18 +1,7 @@
 (library
  (name dune_rpc_impl)
- (libraries
-  stdune
-  promote
-  unix
-  fiber
-  csexp_rpc
-  dune_stats
-  dune_rpc_client
-  dune_console
-  dune_util
-  dune_rpc_private
-  dune_rpc_server
-  dune_engine)
+ (libraries stdune promote unix fiber csexp_rpc dune_stats dune_rpc_client
+  dune_console dune_util dune_rpc_private dune_rpc_server dune_engine)
  (synopsis "Dune's rpc server + a usable client")
  (instrumentation
   (backend bisect_ppx)))

src/dune_rpc_server/dune

@@ -1,15 +1,7 @@
 (library
  (name dune_rpc_server)
  (synopsis "Private API to define a dune rpc server")
- (libraries
-  fiber
-  stdune
-  chrome_trace
-  dyn
-  ordering
-  dune_stats
-  dune_util
-  dune_rpc_private
-  unix)
+ (libraries fiber stdune chrome_trace dyn ordering dune_stats dune_util
+  dune_rpc_private unix)
  (instrumentation
   (backend bisect_ppx)))

src/dune_rules/dune

@@ -2,46 +2,12 @@
 
 (library
  (name dune_rules)
- (libraries
-  stdune
-  csexp
-  fiber
-  memo
-  ocaml
-  dune_re
-  predicate_lang
-  dune_console
-  dune_digest
-  install
-  dune_lang
-  dune_glob
-  ocaml_config
-  dune_action_plugin
-  chrome_trace
-  dune_stats
-  dune_site_private
-  dune_util
-  dune_meta_parser
-  dune_section
-  opam_format
-  dune_cache
-  dune_pkg
-  dune_targets
-  opam_core
-  promote
-  action_ext
-  build_path_prefix_map
-  dune_engine
-  dune_vcs
-  dune_cache_storage
-  dune_config
-  dune_config_file
-  dune_findlib
-  dune_patch
-  scheme
-  fs
-  unix
-  xdg)
+ (libraries stdune csexp fiber memo ocaml dune_re predicate_lang dune_console
+  dune_digest install dune_lang dune_glob ocaml_config dune_action_plugin
+  chrome_trace dune_stats dune_site_private dune_util dune_meta_parser
+  dune_section opam_format dune_cache dune_pkg dune_targets opam_core promote
+  action_ext build_path_prefix_map dune_engine dune_vcs dune_cache_storage
+  dune_config dune_config_file dune_findlib dune_patch scheme fs unix xdg)
  (synopsis "Internal Dune library, do not use!")
  (instrumentation
   (backend bisect_ppx)))

src/dune_rules_rpc/dune

@@ -1,15 +1,7 @@
 (library
  (name dune_rules_rpc)
  (synopsis "rpc functionality that depends on dune's public rules")
- (libraries
-  stdune
-  fiber
-  memo
-  dune_lang
-  dune_engine
-  dune_rpc_impl
-  dune_rpc_private
-  dune_rpc_server
-  dune_rules)
+ (libraries stdune fiber memo dune_lang dune_engine dune_rpc_impl
+  dune_rpc_private dune_rpc_server dune_rules)
  (instrumentation
   (backend bisect_ppx)))

src/dune_tui/dune

@@ -1,16 +1,7 @@
 (library
  (name dune_tui)
- (libraries
-  stdune
-  dune_lwd
-  dune_util
-  dune_nottui
-  dune_notty
-  dune_notty_unix
-  dune_config
-  dune_console
-  dune_threaded_console
-  threads.posix)
+ (libraries stdune dune_lwd dune_util dune_nottui dune_notty dune_notty_unix
+  dune_config dune_console dune_threaded_console threads.posix)
  (instrumentation
   (backend bisect_ppx)))
 

src/install/dune

@@ -1,15 +1,5 @@
 (library
  (name install)
  (synopsis "the handling of installation paths")
- (libraries
-  stdune
-  dyn
-  opam_file_format
-  ocaml
-  dune_util
-  dune_findlib
-  dune_pkg
-  dune_engine
-  dune_section
-  dune_lang
-  dune_sexp))
+ (libraries stdune dyn opam_file_format ocaml dune_util dune_findlib dune_pkg
+  dune_engine dune_section dune_lang dune_sexp))

src/promote/dune

@@ -1,10 +1,4 @@
 (library
  (name promote)
- (libraries
-  stdune
-  dune_engine
-  action_ext
-  dune_sexp
-  dune_console
-  dune_util
+ (libraries stdune dune_engine action_ext dune_sexp dune_console dune_util
   fiber))

src/upgrader/dune

@@ -1,14 +1,7 @@
 (library
  (name dune_upgrader)
- (libraries
-  stdune
-  dune_console
-  memo
-  opam_file_format
-  dune_lang
-  dune_engine
-  dune_rules
-  fiber)
+ (libraries stdune dune_console memo opam_file_format dune_lang dune_engine
+  dune_rules fiber)
  (synopsis "Internal Dune library, do not use!")
  (instrumentation
   (backend bisect_ppx)))

test/blackbox-tests/test-cases/ctypes/dune

@@ -26,13 +26,8 @@
   (package integers)))
 
 (cram
- (applies_to
-  bytecode-stubs-external-lib
-  lib-pkg_config
-  lib-pkg_config-multiple-fd
-  lib-external-name-need-mangling
-  exe-pkg_config-multiple-fd
-  lib-return-errno
-  github-5561-name-mangle
+ (applies_to bytecode-stubs-external-lib lib-pkg_config
+  lib-pkg_config-multiple-fd lib-external-name-need-mangling
+  exe-pkg_config-multiple-fd lib-return-errno github-5561-name-mangle
   exe-pkg_config)
  (deps %{bin:pkg-config}))

test/blackbox-tests/test-cases/dune

@@ -3,14 +3,9 @@
   (env-vars
    (DUNE_CONFIG__BACKGROUND_SANDBOXES disabled)
    (DUNE_CONFIG__BACKGROUND_DIGESTS disabled))
-  (binaries
-   ../utils/dune_cmd.exe
-   ../utils/dunepp.exe
-   ../utils/melc_stdlib_prefix.exe
-   ../utils/refmt.exe
-   ../utils/curl
-   ../utils/sherlodoc.exe
-   ../utils/ocaml_index.exe)))
+  (binaries ../utils/dune_cmd.exe ../utils/dunepp.exe
+   ../utils/melc_stdlib_prefix.exe ../utils/refmt.exe ../utils/curl
+   ../utils/sherlodoc.exe ../utils/ocaml_index.exe)))
 
 (cram
  (applies_to pp-cwd)

test/blackbox-tests/test-cases/pkg/dune

@@ -39,21 +39,12 @@
 
 (cram
  (deps %{bin:curl})
- (applies_to
-  unavailable-source-package
-  compute-checksums-when-missing
-  e2e
-  ocamlformat-dev-tool
-  source-caching
-  tarball
-  extra-sources))
+ (applies_to unavailable-source-package compute-checksums-when-missing e2e
+  ocamlformat-dev-tool source-caching tarball extra-sources))
 
 (cram
  (deps %{bin:md5sum})
- (applies_to
-  source-caching
-  extra-sources
-  ocamlformat-dev-tool
+ (applies_to source-caching extra-sources ocamlformat-dev-tool
   dev-tool-conflict-test))
 
 (cram