Commits

ysulsky committed 756bb75

auto export

  • Participants
  • Parent commits fb32ab5

Comments (0)

Files changed (3)

File base/async/core/lib/async_stream.ml

 open Import
 open Deferred_std
 
-type ('a, 'execution_context) next_ = ('a, 'execution_context) Raw_stream.next =
-  Nil | Cons of 'a * ('a, 'execution_context) Raw_stream.t
-
-type 'a next = ('a, Execution_context.t) next_
-
-type 'a t = ('a, Execution_context.t) Raw_stream.t with sexp_of
-
-let next = Raw_stream.next
-
-(* This line is needed in to avoid a dependency cycle when building with ocamlbuild, which
-   considers both the '.ml' and the '.mli' as part of a single compilation unit. Without
-   this line, async_stream.ml would depend on Monitor (while monitor.mli depends on
-   Async_stream). *)
-(* module Monitor = Raw_monitor *)
+include Raw_async_stream
 
 let first_exn t =
   next t

File base/async/core/lib/monitor.mli

 
 (** [errors t] returns a stream of all subsequent errors that monitor [t]
     sees. *)
-val errors : t -> exn Async_stream.t
+val errors : t -> exn Raw_async_stream.t
 
 (** [error t] returns a deferred that becomes defined if the monitor ever
     sees an error.  Calling [error t] does not count as "listening for errors",
 
 (** [catch_stream ?name f] runs [f ()] inside a new monitor [m] and returns the stream of
     errors raised to [m]. *)
-val catch_stream : ?name:string -> (unit -> unit) -> exn Async_stream.t
+val catch_stream : ?name:string -> (unit -> unit) -> exn Raw_async_stream.t
 
 (** [catch ?name f] runs [f ()] inside a new monitor [m] and returns the first error
     raised to [m]. *)

File base/async/core/lib/raw_async_stream.ml

+open Core.Std
+
+(* This module exists to break a dependency cycle when building with ocamlbuild,
+   which considers both the '.ml' and the '.mli' as part of a single compilation
+   unit. It is referenced directly by monitor.mli. *)
+
+type ('a, 'execution_context) next_ = ('a, 'execution_context) Raw_stream.next =
+  Nil | Cons of 'a * ('a, 'execution_context) Raw_stream.t
+
+type 'a next = ('a, Execution_context.t) next_
+
+type 'a t = ('a, Execution_context.t) Raw_stream.t with sexp_of
+
+let next = Raw_stream.next
+