Skip to content

Commit 0ca5d50

Browse files
Merge pull request #363 from Leonidas-from-XIV/remove-stanza-package-test
Remove `require-package` label support
2 parents 4f765a8 + 162b559 commit 0ca5d50

File tree

13 files changed

+3
-58
lines changed

13 files changed

+3
-58
lines changed

CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
is 4.08 to 4.13 now (#345, @Leonidas-from-XIV)
2323
- Do not install deprecated `mdx` binary anymore (#274, @gpetiot)
2424
- Remove deprecated `rule` command (#312, @gpetiot)
25+
- Remove support for `require-package` label, use the `mdx` stanza in dune
26+
instead. This label was only used for the `rule` command and can now be
27+
safely removed. (#363, @Leonidas-from-XIV)
2528

2629
#### Security
2730

lib/label.ml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ type t =
8484
| Skip
8585
| Non_det of non_det option
8686
| Version of Relation.t * Ocaml_version.t
87-
| Require_package of string
8887
| Set of string * string
8988
| Unset of string
9089
| Block_kind of block_kind
@@ -107,7 +106,6 @@ let pp ppf = function
107106
| Non_det (Some Nd_command) -> Fmt.string ppf "non-deterministic=command"
108107
| Version (op, v) ->
109108
Fmt.pf ppf "version%a%a" Relation.pp op Ocaml_version.pp v
110-
| Require_package p -> Fmt.pf ppf "require-package=%s" p
111109
| Set (v, x) -> Fmt.pf ppf "set-%s=%s" v x
112110
| Unset x -> Fmt.pf ppf "unset-%s" x
113111
| Block_kind bk -> pp_block_kind ppf bk
@@ -176,8 +174,6 @@ let interpret label value =
176174
| "file" -> requires_eq_value ~label ~value (fun x -> File x)
177175
| "part" -> requires_eq_value ~label ~value (fun x -> Part x)
178176
| "env" -> requires_eq_value ~label ~value (fun x -> Env x)
179-
| "require-package" ->
180-
requires_eq_value ~label ~value (fun x -> Require_package x)
181177
| l when is_prefix ~prefix:"set-" l ->
182178
requires_eq_value ~label ~value (fun x ->
183179
Set (split_prefix ~prefix:"set-" l, x))

lib/label.mli

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ type t =
4141
| Skip
4242
| Non_det of non_det option
4343
| Version of Relation.t * Ocaml_version.t
44-
| Require_package of string
4544
| Set of string * string
4645
| Unset of string
4746
| Block_kind of block_kind

test/bin/misc-test-cases/mdx-test-require-local-package/dune

Lines changed: 0 additions & 10 deletions
This file was deleted.

test/bin/misc-test-cases/mdx-test-require-local-package/private_lib/dune-project

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/bin/misc-test-cases/mdx-test-require-local-package/private_lib/example_exe/dune

Lines changed: 0 additions & 4 deletions
This file was deleted.

test/bin/misc-test-cases/mdx-test-require-local-package/private_lib/example_exe/example_exe.ml

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/bin/misc-test-cases/mdx-test-require-local-package/private_lib/example_lib.opam

Whitespace-only changes.

test/bin/misc-test-cases/mdx-test-require-local-package/private_lib/example_lib/dune

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/bin/misc-test-cases/mdx-test-require-local-package/private_lib/example_lib/example_lib.ml

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)