Skip to content

Use deriving_inline construct in backends to reduce build dependencies #95

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
mbarbin merged 3 commits into from
Aug 14, 2025
Merged

Use deriving_inline construct in backends to reduce build dependencies #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f11d9de
Use deriving inline in volgo backends
mbarbin Aug 14, 2025
3116465
Remove dependencies (now unused)
mbarbin Aug 14, 2025
b121b5c
Fix missing explicit dependency
mbarbin Aug 14, 2025
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
24 changes: 0 additions & 24 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@
(>= 2.0.0))
(pplumbing
(>= 0.0.14))
(ppx_sexp_conv
(>= v0.16))
(ppxlib
(>= 0.33))
(sexplib0
(>= v0.16))
(volgo
Expand All @@ -158,10 +154,6 @@
(>= 2.0.0))
(pplumbing
(>= 0.0.14))
(ppx_sexp_conv
(>= v0.16))
(ppxlib
(>= 0.33))
(sexplib0
(>= v0.16))
(volgo
Expand All @@ -185,10 +177,6 @@
(>= 2.0.0))
(pplumbing
(>= 0.0.14))
(ppx_sexp_conv
(>= v0.17))
(ppxlib
(>= 0.33))
(sexplib0
(>= v0.17))
(volgo
Expand All @@ -214,10 +202,6 @@
(>= 2.0.0))
(pplumbing
(>= 0.0.14))
(ppx_sexp_conv
(>= v0.17))
(ppxlib
(>= 0.33))
(sexplib0
(>= v0.17))
(volgo
Expand All @@ -243,10 +227,6 @@
(>= 2.0.0))
(pplumbing
(>= 0.0.14))
(ppx_sexp_conv
(>= v0.16))
(ppxlib
(>= 0.33))
(sexplib0
(>= v0.16))
(spawn
Expand All @@ -272,10 +252,6 @@
(>= 2.0.0))
(pplumbing
(>= 0.0.14))
(ppx_sexp_conv
(>= v0.16))
(ppxlib
(>= 0.33))
(sexplib0
(>= v0.16))
(volgo
Expand Down
12 changes: 9 additions & 3 deletions lib/volgo_git_backend/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@
(instrumentation
(backend bisect_ppx))
(lint
(pps ppx_js_style -allow-let-operators -check-doc-comments))
(pps
-unused-code-warnings=force
;; Actual linters
ppx_js_style
-allow-let-operators
-check-doc-comments
;; Ppx used with deriving_inline
ppx_sexp_conv))
(modules_without_implementation runtime)
(preprocess
(pps -unused-code-warnings=force ppx_sexp_conv)))
(preprocess no_preprocessing))
2 changes: 1 addition & 1 deletion lib/volgo_git_backend/src/munged_path.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type t = Vcs.Num_status.Key.t =
{ src : Vcs.Path_in_repo.t
; dst : Vcs.Path_in_repo.t
}
[@@deriving sexp_of]

val sexp_of_t : t -> Sexp.t
val equal : t -> t -> bool
val parse_exn : string -> t
22 changes: 21 additions & 1 deletion lib/volgo_git_backend/src/name_status.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,27 @@ module Diff_status = struct
| `X
| `Not_supported
]
[@@deriving sexp_of]
[@@deriving_inline sexp_of]

let sexp_of_t =
(function
| `A -> Sexplib0.Sexp.Atom "A"
| `D -> Sexplib0.Sexp.Atom "D"
| `M -> Sexplib0.Sexp.Atom "M"
| `R -> Sexplib0.Sexp.Atom "R"
| `T -> Sexplib0.Sexp.Atom "T"
| `C -> Sexplib0.Sexp.Atom "C"
| `U -> Sexplib0.Sexp.Atom "U"
| `Q -> Sexplib0.Sexp.Atom "Q"
| `I -> Sexplib0.Sexp.Atom "I"
| `Question_mark -> Sexplib0.Sexp.Atom "Question_mark"
| `Bang -> Sexplib0.Sexp.Atom "Bang"
| `X -> Sexplib0.Sexp.Atom "X"
| `Not_supported -> Sexplib0.Sexp.Atom "Not_supported"
: t -> Sexplib0.Sexp.t)
;;

[@@@deriving.end]
end

include T
Expand Down
2 changes: 1 addition & 1 deletion lib/volgo_git_backend/src/name_status.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ module Diff_status : sig
| `X
| `Not_supported
]
[@@deriving sexp_of]

val sexp_of_t : t -> Sexp.t
val parse_exn : string -> t
end

Expand Down
16 changes: 15 additions & 1 deletion lib/volgo_git_backend/src/num_status.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,21 @@ module Status_code = struct
| Dash
| Num of int
| Other of string
[@@deriving sexp_of]
[@@deriving_inline sexp_of]

let sexp_of_t =
(function
| Dash -> Sexplib0.Sexp.Atom "Dash"
| Num arg0__001_ ->
let res0__002_ = sexp_of_int arg0__001_ in
Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "Num"; res0__002_ ]
| Other arg0__003_ ->
let res0__004_ = sexp_of_string arg0__003_ in
Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "Other"; res0__004_ ]
: t -> Sexplib0.Sexp.t)
;;

[@@@deriving.end]
end

include T
Expand Down
30 changes: 29 additions & 1 deletion lib/volgo_git_backend/src/refs.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,35 @@ module Dereferenced = struct
; ref_kind : Vcs.Ref_kind.t
; dereferenced : bool
}
[@@deriving sexp_of]
[@@deriving_inline sexp_of]

let sexp_of_t =
(fun { rev = rev__002_
; ref_kind = ref_kind__004_
; dereferenced = dereferenced__006_
} ->
let bnds__001_ = ([] : _ Stdlib.List.t) in
let bnds__001_ =
let arg__007_ = sexp_of_bool dereferenced__006_ in
(Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "dereferenced"; arg__007_ ]
:: bnds__001_
: _ Stdlib.List.t)
in
let bnds__001_ =
let arg__005_ = Vcs.Ref_kind.sexp_of_t ref_kind__004_ in
(Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "ref_kind"; arg__005_ ] :: bnds__001_
: _ Stdlib.List.t)
in
let bnds__001_ =
let arg__003_ = Vcs.Rev.sexp_of_t rev__002_ in
(Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "rev"; arg__003_ ] :: bnds__001_
: _ Stdlib.List.t)
in
Sexplib0.Sexp.List bnds__001_
: t -> Sexplib0.Sexp.t)
;;

[@@@deriving.end]

let equal =
(fun a__001_ b__002_ ->
Expand Down
2 changes: 1 addition & 1 deletion lib/volgo_git_backend/src/refs.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ module Dereferenced : sig
; ref_kind : Vcs.Ref_kind.t
; dereferenced : bool
}
[@@deriving sexp_of]

val sexp_of_t : t -> Sexp.t
val equal : t -> t -> bool
val parse_exn : line:string -> t
end
Expand Down
12 changes: 9 additions & 3 deletions lib/volgo_git_eio/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
(instrumentation
(backend bisect_ppx))
(lint
(pps ppx_js_style -allow-let-operators -check-doc-comments))
(preprocess
(pps -unused-code-warnings=force ppx_sexp_conv)))
(pps
-unused-code-warnings=force
;; Actual linters
ppx_js_style
-allow-let-operators
-check-doc-comments
;; Ppx used with deriving_inline
ppx_sexp_conv))
(preprocess no_preprocessing))
13 changes: 12 additions & 1 deletion lib/volgo_git_eio/src/make_runtime.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,18 @@ module Exit_status = struct
[ `Exited of int
| `Signaled of int
]
[@@deriving sexp_of]
[@@deriving_inline sexp_of]

let sexp_of_t =
(function
| `Exited v__001_ ->
Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "Exited"; sexp_of_int v__001_ ]
| `Signaled v__002_ ->
Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "Signaled"; sexp_of_int v__002_ ]
: t -> Sexplib0.Sexp.t)
;;

[@@@deriving.end]
end

module Lines = struct
Expand Down
13 changes: 10 additions & 3 deletions lib/volgo_git_unix/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,20 @@
pp
pplumbing.err
pplumbing.pp-tty
sexplib0
spawn
unix
volgo
volgo-git-backend)
(instrumentation
(backend bisect_ppx))
(lint
(pps ppx_js_style -allow-let-operators -check-doc-comments))
(preprocess
(pps -unused-code-warnings=force ppx_sexp_conv)))
(pps
-unused-code-warnings=force
;; Actual linters
ppx_js_style
-allow-let-operators
-check-doc-comments
;; Ppx used with deriving_inline
ppx_sexp_conv))
(preprocess no_preprocessing))
16 changes: 15 additions & 1 deletion lib/volgo_git_unix/src/make_runtime.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,21 @@ module Exit_status = struct
| `Stopped of int
| `Unknown
]
[@@deriving sexp_of]
[@@deriving_inline sexp_of]

let sexp_of_t =
(function
| `Exited v__001_ ->
Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "Exited"; sexp_of_int v__001_ ]
| `Signaled v__002_ ->
Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "Signaled"; sexp_of_int v__002_ ]
| `Stopped v__003_ ->
Sexplib0.Sexp.List [ Sexplib0.Sexp.Atom "Stopped"; sexp_of_int v__003_ ]
| `Unknown -> Sexplib0.Sexp.Atom "Unknown"
: t -> Sexplib0.Sexp.t)
;;

[@@@deriving.end]
end

module Lines = struct
Expand Down
3 changes: 1 addition & 2 deletions lib/volgo_hg_backend/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@
(lint
(pps ppx_js_style -allow-let-operators -check-doc-comments))
(modules_without_implementation runtime)
(preprocess
(pps -unused-code-warnings=force ppx_sexp_conv)))
(preprocess no_preprocessing))
3 changes: 1 addition & 2 deletions lib/volgo_hg_eio/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@
(backend bisect_ppx))
(lint
(pps ppx_js_style -allow-let-operators -check-doc-comments))
(preprocess
(pps -unused-code-warnings=force ppx_sexp_conv)))
(preprocess no_preprocessing))
4 changes: 2 additions & 2 deletions lib/volgo_hg_unix/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
pp
pplumbing.err
pplumbing.pp-tty
sexplib0
unix
volgo
volgo-git-unix
Expand All @@ -29,5 +30,4 @@
(backend bisect_ppx))
(lint
(pps ppx_js_style -allow-let-operators -check-doc-comments))
(preprocess
(pps -unused-code-warnings=force ppx_sexp_conv)))
(preprocess no_preprocessing))
2 changes: 0 additions & 2 deletions volgo-git-backend.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ depends: [
"fpath-sexp0" {>= "0.3.1"}
"pp" {>= "2.0.0"}
"pplumbing" {>= "0.0.14"}
"ppx_sexp_conv" {>= "v0.16"}
"ppxlib" {>= "0.33"}
"sexplib0" {>= "v0.16"}
"volgo" {= version}
"odoc" {with-doc}
Expand Down
2 changes: 0 additions & 2 deletions volgo-git-eio.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ depends: [
"fpath-sexp0" {>= "0.3.1"}
"pp" {>= "2.0.0"}
"pplumbing" {>= "0.0.14"}
"ppx_sexp_conv" {>= "v0.17"}
"ppxlib" {>= "0.33"}
"sexplib0" {>= "v0.17"}
"volgo" {= version}
"volgo-git-backend" {= version}
Expand Down
2 changes: 0 additions & 2 deletions volgo-git-unix.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ depends: [
"fpath-sexp0" {>= "0.3.1"}
"pp" {>= "2.0.0"}
"pplumbing" {>= "0.0.14"}
"ppx_sexp_conv" {>= "v0.16"}
"ppxlib" {>= "0.33"}
"sexplib0" {>= "v0.16"}
"spawn" {>= "v0.16"}
"volgo" {= version}
Expand Down
2 changes: 0 additions & 2 deletions volgo-hg-backend.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ depends: [
"fpath-sexp0" {>= "0.3.1"}
"pp" {>= "2.0.0"}
"pplumbing" {>= "0.0.14"}
"ppx_sexp_conv" {>= "v0.16"}
"ppxlib" {>= "0.33"}
"sexplib0" {>= "v0.16"}
"volgo" {= version}
"odoc" {with-doc}
Expand Down
2 changes: 0 additions & 2 deletions volgo-hg-eio.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ depends: [
"fpath-sexp0" {>= "0.3.1"}
"pp" {>= "2.0.0"}
"pplumbing" {>= "0.0.14"}
"ppx_sexp_conv" {>= "v0.17"}
"ppxlib" {>= "0.33"}
"sexplib0" {>= "v0.17"}
"volgo" {= version}
"volgo-git-eio" {= version}
Expand Down
2 changes: 0 additions & 2 deletions volgo-hg-unix.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ depends: [
"fpath-sexp0" {>= "0.3.1"}
"pp" {>= "2.0.0"}
"pplumbing" {>= "0.0.14"}
"ppx_sexp_conv" {>= "v0.16"}
"ppxlib" {>= "0.33"}
"sexplib0" {>= "v0.16"}
"volgo" {= version}
"volgo-git-unix" {= version}
Expand Down
Loading