blob: 737a7549e398bdacd951694df001234d770202fc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
diff --git a/dune-project b/dune-project
index c641a2db..7eec36e0 100644
--- a/dune-project
+++ b/dune-project
@@ -38,7 +38,4 @@
(>= 2.3.0))
(lwt :with-test)
camlp-streams
- result
- (alcotest :with-test))
- (conflicts
- (result (< 1.5))))
+ (alcotest :with-test)))
diff --git a/lib/block.mli b/lib/block.mli
index 68a02795..cd29d2c6 100644
--- a/lib/block.mli
+++ b/lib/block.mli
@@ -130,7 +130,7 @@ val mk_include :
(** [mk_include] builds an include block from a comment [<!-- $MDX ... -->] that
is not followed by a code block [``` ... ```]. *)
-val from_raw : Raw.t -> (t, [ `Msg of string ] list) Result.result
+val from_raw : Raw.t -> (t, [ `Msg of string ] list) Result.t
(** {2 Printers} *)
diff --git a/mdx.opam b/mdx.opam
index 833e964d..d4ddd912 100644
--- a/mdx.opam
+++ b/mdx.opam
@@ -31,13 +31,9 @@ depends: [
"ocaml-version" {>= "2.3.0"}
"lwt" {with-test}
"camlp-streams"
- "result"
"alcotest" {with-test}
"odoc" {with-doc}
]
-conflicts: [
- "result" {< "1.5"}
-]
build: [
["dune" "subst"] {dev}
[
diff --git a/vendor/odoc-parser/src/dune b/vendor/odoc-parser/src/dune
index 52caaaf2..12396b3e 100644
--- a/vendor/odoc-parser/src/dune
+++ b/vendor/odoc-parser/src/dune
@@ -5,4 +5,4 @@
(package mdx)
(flags
(:standard -w -50))
- (libraries astring result camlp-streams))
+ (libraries astring camlp-streams))
|