Rollback dune file formatting change in 3.20.0

bench/dune

@@ -1,8 +1,15 @@
 (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)

otherlibs/stdune/src/dune

@@ -15,5 +15,10 @@
   (:include flags/sexp))
  (foreign_stubs
   (language c)
-  (names dune_flock readdir wait4_stubs platform_stubs copyfile_stubs
+  (names
+   dune_flock
+   readdir
+   wait4_stubs
+   platform_stubs
+   copyfile_stubs
    signal_stubs)))

src/dune_cache/dune

@@ -1,5 +1,13 @@
 (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))

src/dune_config_file/dune

@@ -1,6 +1,18 @@
 (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 dune_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
+  dune_spawn)
  (synopsis "Internal Dune library, do not use!"))

src/dune_digest/dune

@@ -1,4 +1,10 @@
 (library
  (name dune_digest)
- (libraries dune_metrics blake3_mini dune_stats dune_console dune_util stdune
+ (libraries
+  dune_metrics
+  blake3_mini
+  dune_stats
+  dune_console
+  dune_util
+  stdune
   unix))

src/dune_engine/dune

@@ -2,10 +2,35 @@
 
 (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 dune_spawn ocamlc_loc dune_file_watcher
-  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
+  dune_spawn
+  ocamlc_loc
+  dune_file_watcher
+  dune_digest
+  dune_metrics)
  (synopsis "Internal Dune library, do not use!"))

src/dune_file_watcher/dune

@@ -1,5 +1,14 @@
 (library
  (name dune_file_watcher)
- (libraries dune_spawn fsevents dune_console unix stdune threads.posix
-  ocaml_inotify async_inotify_for_dune re fswatch_win)
+ (libraries
+  dune_spawn
+  fsevents
+  dune_console
+  unix
+  stdune
+  threads.posix
+  ocaml_inotify
+  async_inotify_for_dune
+  re
+  fswatch_win)
  (synopsis "Internal Dune library, do not use!"))

src/dune_lang/format.ml

@@ -25,10 +25,7 @@ let print_wrapped_list ~version x =
   let inner = Pp.concat_map ~sep:Pp.space ~f:pp_simple x in
   if version < (2, 8)
   then Pp.char '(' ++ Pp.hovbox ~indent:1 inner ++ Pp.char ')'
-  else
-    (if version < (3, 20) then Pp.hvbox else Pp.hovbox)
-      ~indent:1
-      (Pp.char '(' ++ inner ++ Pp.char ')')
+  else Pp.hvbox ~indent:1 (Pp.char '(' ++ inner ++ Pp.char ')')
 ;;
 
 let pp_comment_line l = Pp.char ';' ++ Pp.verbatim l

src/dune_pkg/dune

@@ -4,6 +4,20 @@
  (foreign_stubs
   (names md5_stubs)
   (language c))
- (libraries stdune fiber fiber_util chrome_trace dune_engine dune_util
-  dune_stats dune_lang dune_console re dune_vcs dune_config opam_format
-  build_info sat xdg))
+ (libraries
+  stdune
+  fiber
+  fiber_util
+  chrome_trace
+  dune_engine
+  dune_util
+  dune_stats
+  dune_lang
+  dune_console
+  re
+  dune_vcs
+  dune_config
+  opam_format
+  build_info
+  sat
+  xdg))

src/dune_rpc_impl/dune

@@ -1,5 +1,16 @@
 (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"))

src/dune_rpc_server/dune

@@ -1,5 +1,13 @@
 (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))

src/dune_rules/dune

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

src/dune_rules_rpc/dune

@@ -1,5 +1,13 @@
 (library
  (name dune_rules_rpc)
  (synopsis "rpc functionality that depends on dune's public rules")
- (libraries stdune fiber memo dune_lang dune_engine source dune_rpc_impl
-  dune_rpc_private dune_rpc_server))
+ (libraries
+  stdune
+  fiber
+  memo
+  dune_lang
+  dune_engine
+  source
+  dune_rpc_impl
+  dune_rpc_private
+  dune_rpc_server))

src/dune_tui/dune

@@ -1,6 +1,15 @@
 (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))
 
 (include_subdirs unqualified)

src/install/dune

@@ -1,5 +1,15 @@
 (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,4 +1,11 @@
 (library
  (name promote)
- (libraries action_ext dune_console dune_engine dune_rpc_private dune_sexp
-  dune_util fiber stdune))
+ (libraries
+  action_ext
+  dune_console
+  dune_engine
+  dune_rpc_private
+  dune_sexp
+  dune_util
+  fiber
+  stdune))

src/source/dune

@@ -1,6 +1,22 @@
 (library
  (name source)
- (libraries chrome_trace dune_config dune_config_file dune_console
-  dune_digest dune_engine dune_glob dune_lang dune_pkg re dune_rpc_private
-  dune_stats dune_util dune_vcs memo ocaml_config predicate_lang stdune)
+ (libraries
+  chrome_trace
+  dune_config
+  dune_config_file
+  dune_console
+  dune_digest
+  dune_engine
+  dune_glob
+  dune_lang
+  dune_pkg
+  re
+  dune_rpc_private
+  dune_stats
+  dune_util
+  dune_vcs
+  memo
+  ocaml_config
+  predicate_lang
+  stdune)
  (synopsis "Internal Dune library, do not use!"))

src/upgrader/dune

@@ -1,5 +1,12 @@
 (library
  (name dune_upgrader)
- (libraries stdune dune_console memo source opam_file_format dune_lang
-  dune_engine fiber)
+ (libraries
+  stdune
+  dune_console
+  memo
+  source
+  opam_file_format
+  dune_lang
+  dune_engine
+  fiber)
  (synopsis "Internal Dune library, do not use!"))

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

@@ -26,8 +26,13 @@
   (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}))