Skip to content

Commit c909eba

Browse files
maistemaiste
committed
chore: update fmt with new dune rules
Signed-off-by: Etienne Marais <[email protected]>
1 parent 2736a09 commit c909eba

File tree

22 files changed

+63
-295
lines changed

22 files changed

+63
-295
lines changed

‎bench/dune

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
(executable
22
(name bench)
33
(modules bench metrics)
4-
(libraries
5-
dune_stats
6-
dune_console
7-
chrome_trace
8-
stdune
9-
fiber
10-
dune_lang
11-
dune_engine
12-
dune_util))
4+
(libraries dune_stats dune_console chrome_trace stdune fiber dune_lang
5+
dune_engine dune_util))
136

147
(rule
158
(alias bench)

‎src/dune_cache/dune

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
(library
22
(name dune_cache)
33
(synopsis "[Internal] Dune's local and cloud build cache")
4-
(libraries
5-
csexp
6-
dune_digest
7-
dune_cache_storage
8-
dune_util
9-
dune_console
10-
dune_targets
11-
fiber
12-
stdune
13-
unix)
4+
(libraries csexp dune_digest dune_cache_storage dune_util dune_console
5+
dune_targets fiber stdune unix)
146
(instrumentation
157
(backend bisect_ppx)))

‎src/dune_config_file/dune

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
(library
22
(name dune_config_file)
3-
(libraries
4-
stdune
5-
xdg
6-
dune_config
7-
dune_console
8-
dune_threaded_console
9-
dune_lang
10-
dune_cache
11-
dune_cache_storage
12-
dune_engine
13-
dune_rpc_private
14-
dune_stats
15-
dune_tui
16-
dune_util
17-
spawn)
3+
(libraries stdune xdg dune_config dune_console dune_threaded_console
4+
dune_lang dune_cache dune_cache_storage dune_engine dune_rpc_private
5+
dune_stats dune_tui dune_util spawn)
186
(synopsis "Internal Dune library, do not use!")
197
(instrumentation
208
(backend bisect_ppx)))

‎src/dune_engine/dune

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,12 @@
22

33
(library
44
(name dune_engine)
5-
(libraries
6-
unix
7-
csexp
8-
stdune
9-
dune_config
10-
dune_console
11-
dyn
12-
fiber
13-
memo
14-
dune_async_io
15-
threads.posix
16-
predicate_lang
17-
dune_cache
18-
dune_cache_storage
19-
dune_glob
20-
dune_targets
21-
chrome_trace
22-
dune_stats
23-
dune_action_plugin
24-
dune_util
25-
build_path_prefix_map
26-
dune_output_truncation
27-
csexp_rpc
28-
dune_rpc_private
29-
dune_rpc_client
30-
dune_thread_pool
31-
spawn
32-
ocamlc_loc
33-
dune_file_watcher
34-
dune_filesystem_stubs
35-
dune_digest
36-
dune_metrics)
5+
(libraries unix csexp stdune dune_config dune_console dyn fiber memo
6+
dune_async_io threads.posix predicate_lang dune_cache dune_cache_storage
7+
dune_glob dune_targets chrome_trace dune_stats dune_action_plugin dune_util
8+
build_path_prefix_map dune_output_truncation csexp_rpc dune_rpc_private
9+
dune_rpc_client dune_thread_pool spawn ocamlc_loc dune_file_watcher
10+
dune_filesystem_stubs dune_digest dune_metrics)
3711
(synopsis "Internal Dune library, do not use!")
3812
(instrumentation
3913
(backend bisect_ppx)))

‎src/dune_file_watcher/dune

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
(library
22
(name dune_file_watcher)
3-
(libraries
4-
spawn
5-
fsevents
6-
dune_console
7-
unix
8-
stdune
9-
threads.posix
10-
ocaml_inotify
11-
async_inotify_for_dune
12-
dune_re
13-
fswatch_win)
3+
(libraries spawn fsevents dune_console unix stdune threads.posix
4+
ocaml_inotify async_inotify_for_dune dune_re fswatch_win)
145
(synopsis "Internal Dune library, do not use!")
156
(instrumentation
167
(backend bisect_ppx)))

‎src/dune_pkg/dune

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
(library
22
(name dune_pkg)
33
(synopsis "[Internal] Dune's packaging support")
4-
(libraries
5-
stdune
6-
fiber
7-
fiber_util
8-
chrome_trace
9-
dune_engine
10-
dune_digest
11-
dune_util
12-
dune_stats
13-
dune_lang
14-
dune_console
15-
dune_re
16-
dune_vcs
17-
dune_config
18-
opam_core
19-
opam_format
20-
build_info
21-
sat
22-
xdg)
4+
(libraries stdune fiber fiber_util chrome_trace dune_engine dune_digest
5+
dune_util dune_stats dune_lang dune_console dune_re dune_vcs dune_config
6+
opam_core opam_format build_info sat xdg)
237
(instrumentation
248
(backend bisect_ppx)))

‎src/dune_pkg/opam_solver.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ module Context = struct
135135
let packages pkg (formula : OpamTypes.formula) =
136136
OpamFormula.iter
137137
(fun (name, _) ->
138-
let name = Package_name.of_opam_package_name name in
139-
Table.Multi.cons acc name pkg)
138+
let name = Package_name.of_opam_package_name name in
139+
Table.Multi.cons acc name pkg)
140140
formula
141141
in
142142
Lazy.force local_packages

‎src/dune_rpc_impl/dune

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
(library
22
(name dune_rpc_impl)
3-
(libraries
4-
stdune
5-
promote
6-
unix
7-
fiber
8-
csexp_rpc
9-
dune_stats
10-
dune_rpc_client
11-
dune_console
12-
dune_util
13-
dune_rpc_private
14-
dune_rpc_server
15-
dune_engine)
3+
(libraries stdune promote unix fiber csexp_rpc dune_stats dune_rpc_client
4+
dune_console dune_util dune_rpc_private dune_rpc_server dune_engine)
165
(synopsis "Dune's rpc server + a usable client")
176
(instrumentation
187
(backend bisect_ppx)))

‎src/dune_rpc_server/dune

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
(library
22
(name dune_rpc_server)
33
(synopsis "Private API to define a dune rpc server")
4-
(libraries
5-
fiber
6-
stdune
7-
chrome_trace
8-
dyn
9-
ordering
10-
dune_stats
11-
dune_util
12-
dune_rpc_private
13-
unix)
4+
(libraries fiber stdune chrome_trace dyn ordering dune_stats dune_util
5+
dune_rpc_private unix)
146
(instrumentation
157
(backend bisect_ppx)))

‎src/dune_rules/dune

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,12 @@
22

33
(library
44
(name dune_rules)
5-
(libraries
6-
stdune
7-
csexp
8-
fiber
9-
memo
10-
ocaml
11-
dune_re
12-
predicate_lang
13-
dune_console
14-
dune_digest
15-
install
16-
dune_lang
17-
dune_glob
18-
ocaml_config
19-
dune_action_plugin
20-
chrome_trace
21-
dune_stats
22-
dune_site_private
23-
dune_util
24-
dune_meta_parser
25-
dune_section
26-
opam_format
27-
dune_cache
28-
dune_pkg
29-
dune_targets
30-
opam_core
31-
promote
32-
action_ext
33-
build_path_prefix_map
34-
dune_engine
35-
dune_vcs
36-
dune_cache_storage
37-
dune_config
38-
dune_config_file
39-
dune_findlib
40-
dune_patch
41-
scheme
42-
fs
43-
unix
44-
xdg)
5+
(libraries stdune csexp fiber memo ocaml dune_re predicate_lang dune_console
6+
dune_digest install dune_lang dune_glob ocaml_config dune_action_plugin
7+
chrome_trace dune_stats dune_site_private dune_util dune_meta_parser
8+
dune_section opam_format dune_cache dune_pkg dune_targets opam_core promote
9+
action_ext build_path_prefix_map dune_engine dune_vcs dune_cache_storage
10+
dune_config dune_config_file dune_findlib dune_patch scheme fs unix xdg)
4511
(synopsis "Internal Dune library, do not use!")
4612
(instrumentation
4713
(backend bisect_ppx)))

‎src/dune_rules_rpc/dune

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
(library
22
(name dune_rules_rpc)
33
(synopsis "rpc functionality that depends on dune's public rules")
4-
(libraries
5-
stdune
6-
fiber
7-
memo
8-
dune_lang
9-
dune_engine
10-
dune_rpc_impl
11-
dune_rpc_private
12-
dune_rpc_server
13-
dune_rules)
4+
(libraries stdune fiber memo dune_lang dune_engine dune_rpc_impl
5+
dune_rpc_private dune_rpc_server dune_rules)
146
(instrumentation
157
(backend bisect_ppx)))

‎src/dune_tui/dune

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
(library
22
(name dune_tui)
3-
(libraries
4-
stdune
5-
dune_lwd
6-
dune_util
7-
dune_nottui
8-
dune_notty
9-
dune_notty_unix
10-
dune_config
11-
dune_console
12-
dune_threaded_console
13-
threads.posix)
3+
(libraries stdune dune_lwd dune_util dune_nottui dune_notty dune_notty_unix
4+
dune_config dune_console dune_threaded_console threads.posix)
145
(instrumentation
156
(backend bisect_ppx)))
167

‎src/install/dune

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
(library
22
(name install)
33
(synopsis "the handling of installation paths")
4-
(libraries
5-
stdune
6-
dyn
7-
opam_file_format
8-
ocaml
9-
dune_util
10-
dune_findlib
11-
dune_pkg
12-
dune_engine
13-
dune_section
14-
dune_lang
15-
dune_sexp))
4+
(libraries stdune dyn opam_file_format ocaml dune_util dune_findlib dune_pkg
5+
dune_engine dune_section dune_lang dune_sexp))

‎src/promote/dune

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
(library
22
(name promote)
3-
(libraries
4-
stdune
5-
dune_engine
6-
action_ext
7-
dune_sexp
8-
dune_console
9-
dune_util
3+
(libraries stdune dune_engine action_ext dune_sexp dune_console dune_util
104
fiber))

‎src/upgrader/dune

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
(library
22
(name dune_upgrader)
3-
(libraries
4-
stdune
5-
dune_console
6-
memo
7-
opam_file_format
8-
dune_lang
9-
dune_engine
10-
dune_rules
11-
fiber)
3+
(libraries stdune dune_console memo opam_file_format dune_lang dune_engine
4+
dune_rules fiber)
125
(synopsis "Internal Dune library, do not use!")
136
(instrumentation
147
(backend bisect_ppx)))

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,8 @@
2626
(package integers)))
2727

2828
(cram
29-
(applies_to
30-
bytecode-stubs-external-lib
31-
lib-pkg_config
32-
lib-pkg_config-multiple-fd
33-
lib-external-name-need-mangling
34-
exe-pkg_config-multiple-fd
35-
lib-return-errno
36-
github-5561-name-mangle
29+
(applies_to bytecode-stubs-external-lib lib-pkg_config
30+
lib-pkg_config-multiple-fd lib-external-name-need-mangling
31+
exe-pkg_config-multiple-fd lib-return-errno github-5561-name-mangle
3732
exe-pkg_config)
3833
(deps %{bin:pkg-config}))

‎test/blackbox-tests/test-cases/dune

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@
33
(env-vars
44
(DUNE_CONFIG__BACKGROUND_SANDBOXES disabled)
55
(DUNE_CONFIG__BACKGROUND_DIGESTS disabled))
6-
(binaries
7-
../utils/dune_cmd.exe
8-
../utils/dunepp.exe
9-
../utils/melc_stdlib_prefix.exe
10-
../utils/refmt.exe
11-
../utils/curl
12-
../utils/sherlodoc.exe
13-
../utils/ocaml_index.exe)))
6+
(binaries ../utils/dune_cmd.exe ../utils/dunepp.exe
7+
../utils/melc_stdlib_prefix.exe ../utils/refmt.exe ../utils/curl
8+
../utils/sherlodoc.exe ../utils/ocaml_index.exe)))
149

1510
(cram
1611
(applies_to pp-cwd)

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,12 @@
3939

4040
(cram
4141
(deps %{bin:curl})
42-
(applies_to
43-
unavailable-source-package
44-
compute-checksums-when-missing
45-
e2e
46-
ocamlformat-dev-tool
47-
source-caching
48-
tarball
49-
extra-sources))
42+
(applies_to unavailable-source-package compute-checksums-when-missing e2e
43+
ocamlformat-dev-tool source-caching tarball extra-sources))
5044

5145
(cram
5246
(deps %{bin:md5sum})
53-
(applies_to
54-
source-caching
55-
extra-sources
56-
ocamlformat-dev-tool
47+
(applies_to source-caching extra-sources ocamlformat-dev-tool
5748
dev-tool-conflict-test))
5849

5950
(cram

0 commit comments

Comments
 (0)