Skip to content

Commit

Permalink
Really make all types Conduit_mirage.S.t equal
Browse files Browse the repository at this point in the history
  • Loading branch information
samoht committed Jun 8, 2015
1 parent 75a4dd9 commit 2c7fb00
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 3 additions & 1 deletion lib/conduit_mirage.ml
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,10 @@ ENDIF

let with_tls t = tls t >|= fun x -> { t with tls = Some x }

type conduit = t

module type S = sig
type t
type t = conduit
val empty: t
val with_tcp: t -> 'a stackv4 -> 'a -> t Lwt.t
val with_tls: t -> t Lwt.t
Expand Down
7 changes: 3 additions & 4 deletions lib/conduit_mirage.mli
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,13 @@ val client: Conduit.endp -> client Lwt.t
val server: Conduit.endp -> server Lwt.t
(** Resolve a confuit endpoint into a server configuration. *)

type t
type conduit
(** The type for conduit values. *)

module type S = sig
(** The signature for Conduit implementations. *)

type t
(** The type for conduit values. *)
type t = conduit

val empty: t
(** The empty conduit. *)
Expand All @@ -142,4 +141,4 @@ module type S = sig

end

include S with type t := t
include S

0 comments on commit 2c7fb00

Please sign in to comment.