Skip to content

Commit ffa7d11

Browse files
kit-ty-katergrinberg
authored andcommitted
fix: Remove uchar and seq dummy modules
they all have their own opam package and were never defined in neither the compiler on ocamlfind Signed-off-by: Kate <kit.ty.kate@disroot.org>
1 parent 574f0f7 commit ffa7d11

File tree

4 files changed

+3
-20
lines changed

4 files changed

+3
-20
lines changed

CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Unreleased
22
----------
33

4+
- Remove `uchar` and `seq` dummy ocamlfind libraries from dune's builtin
5+
library database (#5260, @kit-ty-kate)
6+
47
- Add a `DUNE_DIFF_COMMAND` environment variable to match `--diff-command`
58
command-line parameter (@raphael-proust, fix #5369, #5375)
69

src/dune_rules/findlib/meta.ml

-10
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,6 @@ let builtins ~stdlib_dir ~version:ocaml_version =
232232
in
233233
let dynlink = simple "dynlink" [] ~dir:"+" in
234234
let bytes = dummy "bytes" in
235-
let uchar = dummy "uchar" in
236-
let seq = dummy "seq" in
237235
let threads =
238236
{ name = Some (Lib_name.of_string "threads")
239237
; entries =
@@ -280,14 +278,6 @@ let builtins ~stdlib_dir ~version:ocaml_version =
280278
if Ocaml_version.has_bigarray_library ocaml_version then bigarray :: base
281279
else base
282280
in
283-
let base =
284-
if Ocaml_version.stdlib_includes_uchar ocaml_version then uchar :: base
285-
else base
286-
in
287-
let base =
288-
if Ocaml_version.stdlib_includes_seq ocaml_version then seq :: base
289-
else base
290-
in
291281
let base =
292282
if Path.exists (Path.relative stdlib_dir "graphics.cma") then
293283
graphics :: base

src/dune_rules/ocaml_version.ml

-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@ let supports_response_file version = version >= (4, 05, 0)
2020

2121
let ocamlmklib_supports_response_file version = version >= (4, 08, 0)
2222

23-
let stdlib_includes_uchar version = version >= (4, 03, 0)
24-
2523
let stdlib_includes_bigarray version = version >= (4, 07, 0)
2624

27-
let stdlib_includes_seq version = version >= (4, 07, 0)
28-
2925
let ooi_supports_no_approx version = version >= (4, 05, 0)
3026

3127
let ooi_supports_no_code version = version >= (4, 05, 0)

src/dune_rules/ocaml_version.mli

-6
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,9 @@ val supports_response_file : t -> bool
2929
(** Does ocamlmklib support [-args0]? *)
3030
val ocamlmklib_supports_response_file : t -> bool
3131

32-
(** Whether the standard library includes the [Uchar] module *)
33-
val stdlib_includes_uchar : t -> bool
34-
3532
(** Whether the standard library includes the [Bigarray] module *)
3633
val stdlib_includes_bigarray : t -> bool
3734

38-
(** Whether the standard library includes the [Seq] module *)
39-
val stdlib_includes_seq : t -> bool
40-
4135
(** Whether ocamlobjinfo supports -no-approx*)
4236
val ooi_supports_no_approx : t -> bool
4337

0 commit comments

Comments
 (0)