Merge pull request mirage#364 from CraigFe/unused-resolvers-type

Remove unused Conduit.S.resolvers type
craigfe · Dec 3, 2020 · 194a067 · 194a067
2 parents eaf54be + 9a544cb
commit 194a067
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/core/conduit.ml b/src/core/conduit.ml
@@ -70,6 +70,10 @@ end) : BIJECTION with type +'a s = 'a Functor.t = struct
   external prj : ('a, t) app -> 'a s = "%identity"
 end
 
+module type S = sig
+  include S with type resolvers := resolvers
+end
+
 module Make (IO : IO) (Input : BUFFER) (Output : BUFFER) :
   S
     with type input = Input.t
@@ -222,8 +226,6 @@ module Make (IO : IO) (Input : BUFFER) (Output : BUFFER) :
 
   let ( <.> ) f g x = f (g x)
 
-  type nonrec resolvers = resolvers
-
   let empty = empty
 
   let add :

diff --git a/src/core/conduit_intf.ml b/src/core/conduit_intf.ml
@@ -335,6 +335,7 @@ module type S = sig
   type resolvers
 
   val empty : resolvers
+  (** [empty] is equal to {!Conduit.empty}. *)
 
   val add :
     ('edn, _) protocol ->
@@ -505,7 +506,7 @@ module type Conduit = sig
   (** [empty] is an empty {!resolvers} map. *)
 
   module type S = sig
-    include S
+    include S with type resolvers := resolvers
     (** @inline *)
   end