Skip to content

Updates to use pplumbing #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Updates to use pplumbing #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
(name main)
(public_name dunolint)
(package dunolint)
(libraries cmdlang-cmdliner-runner dunolint_cli)
(libraries dunolint_cli pplumbing.cmdlang-cmdliner-runner)
(flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
(instrumentation
(backend bisect_ppx))
Expand Down
30 changes: 6 additions & 24 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@
(< v0.18)))
(cmdlang
(>= 0.0.9))
(cmdlang-cmdliner-runner
(>= 0.0.8))
(cmdlang-to-cmdliner
(>= 0.0.9))
(cmdliner
(>= 1.3.0))
(dunolint-lib
(= :version))
(file-rewriter
Expand All @@ -114,8 +108,8 @@
(< v0.18)))
(pp
(>= 2.0.0))
(pp-log
(>= 0.0.8))
(pplumbing
(>= 0.0.9))
(ppx_compare
(and
(>= v0.17)
Expand Down Expand Up @@ -169,12 +163,6 @@
(< v0.18)))
(cmdlang
(>= 0.0.9))
(cmdlang-cmdliner-runner
(>= 0.0.8))
(cmdlang-to-cmdliner
(>= 0.0.9))
(cmdliner
(>= 1.3.0))
(dunolint
(= :version))
(dunolint-lib
Expand All @@ -199,8 +187,8 @@
(< v0.18)))
(pp
(>= 2.0.0))
(pp-log
(>= 0.0.8))
(pplumbing
(>= 0.0.9))
(ppx_compare
(and
(>= v0.17)
Expand Down Expand Up @@ -272,12 +260,6 @@
(>= 2.8.3)))
(cmdlang
(>= 0.0.9))
(cmdlang-cmdliner-runner
(>= 0.0.8))
(cmdlang-to-cmdliner
(>= 0.0.9))
(cmdliner
(>= 1.3.0))
(dunolint
(= :version))
(dunolint-lib
Expand Down Expand Up @@ -314,8 +296,8 @@
(< v0.18)))
(pp
(>= 2.0.0))
(pp-log
(>= 0.0.8))
(pplumbing
(>= 0.0.9))
(ppx_compare
(and
(>= v0.17)
Expand Down
2 changes: 1 addition & 1 deletion dunolint-config/bin/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
(name main)
(public_name dunolint-dunolint-config-gen)
(package dunolint-tests)
(libraries cmdlang-cmdliner-runner dunolint_dunolint_config)
(libraries dunolint_dunolint_config pplumbing.cmdlang-cmdliner-runner)
(flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
(instrumentation
(backend bisect_ppx))
Expand Down
5 changes: 1 addition & 4 deletions dunolint-dev.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ depends: [
"base" {>= "v0.17" & < "v0.18"}
"bisect_ppx" {with-dev-setup & >= "2.8.3"}
"cmdlang" {>= "0.0.9"}
"cmdlang-cmdliner-runner" {>= "0.0.8"}
"cmdlang-to-cmdliner" {>= "0.0.9"}
"cmdliner" {>= "1.3.0"}
"dunolint" {= version}
"dunolint-lib" {= version}
"dunolint-tests" {= version}
Expand All @@ -33,7 +30,7 @@ depends: [
"parsexp" {>= "v0.17" & < "v0.18"}
"patdiff" {>= "v0.17" & < "v0.18"}
"pp" {>= "2.0.0"}
"pp-log" {>= "0.0.8"}
"pplumbing" {>= "0.0.9"}
"ppx_compare" {>= "v0.17" & < "v0.18"}
"ppx_enumerate" {>= "v0.17" & < "v0.18"}
"ppx_expect" {>= "v0.17" & < "v0.18"}
Expand Down
5 changes: 1 addition & 4 deletions dunolint-tests.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ depends: [
"ocaml" {>= "5.3"}
"base" {>= "v0.17" & < "v0.18"}
"cmdlang" {>= "0.0.9"}
"cmdlang-cmdliner-runner" {>= "0.0.8"}
"cmdlang-to-cmdliner" {>= "0.0.9"}
"cmdliner" {>= "1.3.0"}
"dunolint" {= version}
"dunolint-lib" {= version}
"expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
Expand All @@ -25,7 +22,7 @@ depends: [
"logs" {>= "0.7.0"}
"patdiff" {>= "v0.17" & < "v0.18"}
"pp" {>= "2.0.0"}
"pp-log" {>= "0.0.8"}
"pplumbing" {>= "0.0.9"}
"ppx_compare" {>= "v0.17" & < "v0.18"}
"ppx_enumerate" {>= "v0.17" & < "v0.18"}
"ppx_expect" {>= "v0.17" & < "v0.18"}
Expand Down
5 changes: 1 addition & 4 deletions dunolint.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ depends: [
"ocaml" {>= "5.3"}
"base" {>= "v0.17" & < "v0.18"}
"cmdlang" {>= "0.0.9"}
"cmdlang-cmdliner-runner" {>= "0.0.8"}
"cmdlang-to-cmdliner" {>= "0.0.9"}
"cmdliner" {>= "1.3.0"}
"dunolint-lib" {= version}
"file-rewriter" {>= "0.0.3"}
"fmt" {>= "0.9.0"}
Expand All @@ -26,7 +23,7 @@ depends: [
"parsexp" {>= "v0.17" & < "v0.18"}
"patdiff" {>= "v0.17" & < "v0.18"}
"pp" {>= "2.0.0"}
"pp-log" {>= "0.0.8"}
"pplumbing" {>= "0.0.9"}
"ppx_compare" {>= "v0.17" & < "v0.18"}
"ppx_enumerate" {>= "v0.17" & < "v0.18"}
"ppx_hash" {>= "v0.17" & < "v0.18"}
Expand Down
4 changes: 2 additions & 2 deletions lib/dune_linter/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
fpath-base
loc
pp
pp-log.err
pp-log.tty
pplumbing.err
pplumbing.pp-tty
sexplib0
sexps-rewriter)
(instrumentation
Expand Down
2 changes: 1 addition & 1 deletion lib/dune_linter/test/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
file-rewriter
fpath-sexp0
loc
pp-log.err
pplumbing.err
sexps-rewriter)
(instrumentation
(backend bisect_ppx))
Expand Down
4 changes: 2 additions & 2 deletions lib/dune_project_linter/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
fpath-base
loc
pp
pp-log.err
pp-log.tty
pplumbing.err
pplumbing.pp-tty
sexplib0
sexps-rewriter)
(instrumentation
Expand Down
2 changes: 1 addition & 1 deletion lib/dune_project_linter/test/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
expect_test_helpers_core.expect_test_helpers_base
file-rewriter
fpath-sexp0
pp-log.err
pplumbing.err
sexps-rewriter)
(instrumentation
(backend bisect_ppx))
Expand Down
6 changes: 3 additions & 3 deletions lib/dunolint_cli/src/cmd__lint.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ module Dune_lint = Lint_file (Dune_linter)
module Dune_project_lint = Lint_file (Dune_project_linter)

let visit_directory ~dunolint_engine ~config ~parent_dir ~files =
Pp_log.debug (fun () ->
Log.debug (fun () ->
Pp.O.
[ Pp.text "Dunolint visit_directory "
++ Pp_tty.path (module Relative_path) parent_dir
Expand All @@ -117,7 +117,7 @@ let visit_directory ~dunolint_engine ~config ~parent_dir ~files =
with
| `enforce nothing -> Nothing.unreachable_code nothing
| `skip_subtree ->
Pp_log.debug (fun () ->
Log.debug (fun () ->
Pp.O.
[ Pp.text "Skipping directory " ++ Pp_tty.path (module Relative_path) parent_dir ]);
Dunolint_engine.Visitor_decision.Skip_subtree
Expand All @@ -143,7 +143,7 @@ let main =
Command.make
~summary:"lint project"
(let%map_open.Command dunolint_engine_config = Dunolint_engine.Config.arg
and () = Pp_log_cli.set_config ()
and () = Log_cli.set_config ()
and config =
Arg.named_opt [ "config" ] Param.file ~doc:"Path to dunolint config file"
and below = Common.below ~doc:"Lint only below this path"
Expand Down
8 changes: 4 additions & 4 deletions lib/dunolint_cli/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
fpath-base
parsexp
pp
pp-log
pp-log.cli
pp-log.err
pp-log.tty
pplumbing.err
pplumbing.log
pplumbing.log-cli
pplumbing.pp-tty
sexps-rewriter
stdio)
(instrumentation
Expand Down
6 changes: 3 additions & 3 deletions lib/dunolint_engine/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
patdiff
patdiff.expect_test_patdiff
pp
pp-log
pp-log.err
pp-log.tty
pplumbing.err
pplumbing.log
pplumbing.pp-tty
sexplib0
sexps-rewriter
stdio
Expand Down
6 changes: 3 additions & 3 deletions lib/dunolint_engine/src/dunolint_engine.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ module File_kind = struct
end

let lint_file ?autoformat_file ?create_file ?rewrite_file t ~path =
Pp_log.info ~src (fun () ->
Log.info ~src (fun () ->
Pp.O.[ Pp.text "Linting file " ++ Pp_tty.path (module Relative_path) path ]);
let edited_file = Hashtbl.find t.edited_files path in
let file_exists =
Expand Down Expand Up @@ -343,7 +343,7 @@ let visit ?below (_ : t) ~f =
];
`Trd ())
in
Pp_log.debug ~src (fun () ->
Log.debug ~src (fun () ->
Pp.O.
[ Pp.text "Visiting directory " ++ Pp_tty.path (module Relative_path) parent_dir
]);
Expand All @@ -357,7 +357,7 @@ let visit ?below (_ : t) ~f =
:: tl
:: rest)
| Skip_subtree ->
Pp_log.info ~src (fun () ->
Log.info ~src (fun () ->
Pp.O.
[ Pp.text "Skipping children of directory "
++ Pp_tty.path (module Relative_path) parent_dir
Expand Down
2 changes: 1 addition & 1 deletion lib/dunolint_engine/test/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
expect_test_helpers_core.expect_test_helpers_base
file-rewriter
fpath-sexp0
pp-log.err
pplumbing.err
sexps-rewriter)
(instrumentation
(backend bisect_ppx))
Expand Down
4 changes: 2 additions & 2 deletions lib/dunolinter/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
fpath-base
loc
pp
pp-log.err
pp-log.tty
pplumbing.err
pplumbing.pp-tty
sexps-rewriter)
(instrumentation
(backend bisect_ppx))
Expand Down
2 changes: 1 addition & 1 deletion lib/dunolinter/test/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
expect_test_helpers_core.expect_test_helpers_base
file-rewriter
fpath-sexp0
pp-log.err
pplumbing.err
sexps-rewriter)
(instrumentation
(backend bisect_ppx))
Expand Down
2 changes: 1 addition & 1 deletion vendor/git_pager/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Base
-open
Stdio)
(libraries base pp pp-log.err pp-log.tty stdio unix)
(libraries base pp pplumbing.err pplumbing.pp-tty stdio unix)
(instrumentation
(backend bisect_ppx))
(lint
Expand Down