Skip to content

Remove copied code between library and library_parameter stanzas #12594

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 2 commits into from
Oct 18, 2025
Merged

Remove copied code between library and library_parameter stanzas #12594

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90cb8ca
dev
rgrinberg Oct 15, 2025
6f974a0
refactor: get rid of some copy-paste in library stanza defns
rgrinberg Oct 18, 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
23 changes: 11 additions & 12 deletions src/dune_rules/stanzas/stanzas.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ let execs exe = [ Executables.make_stanza exe ]

type constructors = Stanza.Parser.t list

let with_redirect decode =
let+ x = decode in
let base = [ Library.make_stanza x ] in
match Library_redirect.Local.of_lib x with
| None -> base
| Some r -> Library_redirect.Local.make_stanza r :: base
;;

let stanzas : constructors =
[ Site_stanzas.all
; Cram_stanza.stanza
Expand All @@ -56,19 +64,10 @@ let stanzas : constructors =
syntax dune files"
stanza
] ))
; [ ( "library"
, let+ x = Library.decode in
let base = [ Library.make_stanza x ] in
match Library_redirect.Local.of_lib x with
| None -> base
| Some r -> Library_redirect.Local.make_stanza r :: base )
; [ "library", with_redirect Library.decode
; ( "library_parameter"
, let+ () = Dune_lang.Syntax.since Dune_lang.Oxcaml.syntax (0, 1)
and+ x = Parameter.decode in
let base = [ Library.make_stanza x ] in
match Library_redirect.Local.of_lib x with
| None -> base
| Some r -> Library_redirect.Local.make_stanza r :: base )
, with_redirect
(Dune_lang.Syntax.since Dune_lang.Oxcaml.syntax (0, 1) >>> Parameter.decode) )
; ( "foreign_library"
, let+ () = Dune_lang.Syntax.since Stanza.syntax (2, 0)
and+ x = Foreign_library.decode in
Expand Down
Loading