Skip to content

Commit

Permalink
Merge pull request #363 from Leonidas-from-XIV/remove-stanza-package-…
Browse files Browse the repository at this point in the history
…test

Remove `require-package` label support
  • Loading branch information
Leonidas-from-XIV authored Dec 14, 2021
2 parents 4f765a8 + 162b559 commit 0ca5d50
Show file tree
Hide file tree
Showing 13 changed files with 3 additions and 58 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
is 4.08 to 4.13 now (#345, @Leonidas-from-XIV)
- Do not install deprecated `mdx` binary anymore (#274, @gpetiot)
- Remove deprecated `rule` command (#312, @gpetiot)
- Remove support for `require-package` label, use the `mdx` stanza in dune
instead. This label was only used for the `rule` command and can now be
safely removed. (#363, @Leonidas-from-XIV)

#### Security

Expand Down
4 changes: 0 additions & 4 deletions lib/label.ml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ type t =
| Skip
| Non_det of non_det option
| Version of Relation.t * Ocaml_version.t
| Require_package of string
| Set of string * string
| Unset of string
| Block_kind of block_kind
Expand All @@ -107,7 +106,6 @@ let pp ppf = function
| Non_det (Some Nd_command) -> Fmt.string ppf "non-deterministic=command"
| Version (op, v) ->
Fmt.pf ppf "version%a%a" Relation.pp op Ocaml_version.pp v
| Require_package p -> Fmt.pf ppf "require-package=%s" p
| Set (v, x) -> Fmt.pf ppf "set-%s=%s" v x
| Unset x -> Fmt.pf ppf "unset-%s" x
| Block_kind bk -> pp_block_kind ppf bk
Expand Down Expand Up @@ -176,8 +174,6 @@ let interpret label value =
| "file" -> requires_eq_value ~label ~value (fun x -> File x)
| "part" -> requires_eq_value ~label ~value (fun x -> Part x)
| "env" -> requires_eq_value ~label ~value (fun x -> Env x)
| "require-package" ->
requires_eq_value ~label ~value (fun x -> Require_package x)
| l when is_prefix ~prefix:"set-" l ->
requires_eq_value ~label ~value (fun x ->
Set (split_prefix ~prefix:"set-" l, x))
Expand Down
1 change: 0 additions & 1 deletion lib/label.mli
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ type t =
| Skip
| Non_det of non_det option
| Version of Relation.t * Ocaml_version.t
| Require_package of string
| Set of string * string
| Unset of string
| Block_kind of block_kind
Expand Down
10 changes: 0 additions & 10 deletions test/bin/misc-test-cases/mdx-test-require-local-package/dune

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 0ca5d50

Please sign in to comment.