Apply new Stream types in relevant modules;

Author: austindd

src/Console.re

@@ -8,8 +8,8 @@ type consoleOptions;
 [@bs.obj]
 external consoleOptions:
   (
-    ~stdout: Stream.Writable.subtype('w, 'r, 'a),
-    ~stderr: Stream.Writable.subtype('w, 'r, 'a)=?,
+    ~stdout: Stream.Writable.subtype('w, 'a),
+    ~stderr: Stream.Writable.subtype('w, 'a)=?,
     ~ignoreErrors: bool=?,
     ~colorMode: bool=?,
     ~inspectOptions: Util.inspectOptions=?,
@@ -20,7 +20,7 @@ external consoleOptions:
 [@bs.new] [@bs.module "console"]
 external make: consoleOptions => t = "Console";
 [@bs.new] [@bs.module "console"]
-external make2: {.. "stdout": Stream.Writable.subtype('w, 'r, 'a)} => t =
+external make2: {.. "stdout": Stream.Writable.subtype('w, 'a)} => t =
   "Console";
 
 [@bs.send] external assert_: (t, bool) => unit = "assert";

src/Console__.re

@@ -61,11 +61,10 @@ module PublicKey = {
 };
 
 module Hash = {
-  type kind = [ Stream.transform | `Hash];
-  type subtype('w, 'r, 'a) =
-    Stream.Transform.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, kind);
+  type kind('w, 'r) = [ Stream.transform('w, 'r) | `Hash];
+  type subtype('w, 'r, 'a) = Stream.subtype([> kind('w, 'r)] as 'a);
+  type supertype('w, 'r, 'a) = Stream.subtype([< kind('w, 'r)] as 'a);
+  type t = subtype(Buffer.t, Buffer.t, kind('w, 'r));
   module Impl = {
     include Stream.Transform.Impl;
     [@bs.send] external copy: t => t = "copy";
@@ -78,11 +77,10 @@ module Hash = {
 [@bs.module "crypto"] external createHash: string => Hash.t = "createHash";
 
 module Hmac = {
-  type kind = [ Stream.transform | `Hmac];
-  type subtype('w, 'r, 'a) =
-    Stream.Transform.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, kind);
+  type kind('w, 'r) = [ Stream.transform('w, 'r) | `Hmac];
+  type subtype('w, 'r, 'a) = Stream.subtype([> kind('w, 'r)] as 'a);
+  type supertype('w, 'r, 'a) = Stream.subtype([< kind('w, 'r)] as 'a);
+  type t = subtype(Buffer.t, Buffer.t, kind('w, 'r));
   module Impl = {
     include Stream.Transform.Impl;
     [@bs.send] external digest: t => Buffer.t = "digest";
@@ -105,11 +103,10 @@ module Certificate = {
 };
 
 module Cipher = {
-  type kind = [ Stream.transform | `Cipher];
-  type subtype('w, 'r, 'a) =
-    Stream.Transform.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, kind);
+  type kind('w, 'r) = [ Stream.transform('w, 'r) | `Cipher];
+  type subtype('w, 'r, 'a) = Stream.subtype([> kind('w, 'r)] as 'a);
+  type supertype('w, 'r, 'a) = Stream.subtype([< kind('w, 'r)] as 'a);
+  type t = subtype(Buffer.t, Buffer.t, kind('w, 'r));
   module Impl = {
     include Stream.Transform.Impl;
     [@bs.send] external final: (t, string) => Buffer.t = "final";
@@ -150,11 +147,10 @@ module Cipher = {
 };
 
 module Decipher = {
-  type kind = [ Stream.transform | `Decipher];
-  type subtype('w, 'r, 'a) =
-    Stream.Transform.subtype('w, 'r, [> kind] as 'a);
-  type supertype('w, 'r, 'a) = Stream.subtype('w, 'r, [< kind] as 'a);
-  type t = subtype(Buffer.t, Buffer.t, kind);
+  type kind('w, 'r) = [ Stream.transform('w, 'r) | `Decipher];
+  type subtype('w, 'r, 'a) = Stream.subtype([> kind('w, 'r)] as 'a);
+  type supertype('w, 'r, 'a) = Stream.subtype([< kind('w, 'r)] as 'a);
+  type t = subtype(Buffer.t, Buffer.t, kind('w, 'r));
   module Impl = {
     [@bs.send]
     external final: (subtype('w, 'r, 'a), string) => Buffer.t = "final";