Skip to content

Commit d6dd46a

Browse files
austinddaustindd
committed
Removed abstract types for stream return types; see issue #39;
1 parent 2a76e68 commit d6dd46a

File tree

2 files changed

+45
-52
lines changed

2 files changed

+45
-52
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
"@glennsl/bs-jest": "^0.4.10",
2525
"bs-platform": "7.3.2"
2626
}
27-
}
27+
}

‎src/Stream.re‎

Lines changed: 44 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ type chunk('a) =
2121
encoding: string,
2222
};
2323

24-
type destroy_done;
25-
type writev_done;
26-
type final_done;
27-
type write_done;
28-
type transform_done;
29-
type flush_done;
30-
3124
module Common = {
3225
type kind = [ stream];
3326

@@ -280,37 +273,37 @@ module Writable = {
280273
(
281274
t('w),
282275
~error: Js.nullable(Js.Exn.t),
283-
~callback: (~error: option(Js.Exn.t)) => destroy_done
276+
~callback: (~error: option(Js.Exn.t)) => unit
284277
) =>
285-
destroy_done
278+
unit
286279
)
287280
=?,
288281
~final: [@bs.this] (
289282
(
290283
t('w),
291-
~callback: (~error: option(Js.Exn.t)) => final_done
284+
~callback: (~error: option(Js.Exn.t)) => unit
292285
) =>
293-
final_done
286+
unit
294287
)
295288
=?,
296289
~writev: [@bs.this] (
297290
(
298291
t('w),
299292
~data: array(chunk('w)),
300293
~encoding: StringEncoding.t,
301-
~callback: (~error: option(Js.Exn.t)) => writev_done
294+
~callback: (~error: option(Js.Exn.t)) => unit
302295
) =>
303-
writev_done
296+
unit
304297
)
305298
=?,
306299
~write: [@bs.this] (
307300
(
308301
t('w),
309302
~data: 'w,
310303
~encoding: StringEncoding.t,
311-
~callback: (~error: option(Js.Exn.t)) => write_done
304+
~callback: (~error: option(Js.Exn.t)) => unit
312305
) =>
313-
write_done
306+
unit
314307
),
315308
unit
316309
) =>
@@ -330,37 +323,37 @@ module Writable = {
330323
(
331324
objStream('w),
332325
~error: Js.nullable(Js.Exn.t),
333-
~callback: (~error: option(Js.Exn.t)) => destroy_done
326+
~callback: (~error: option(Js.Exn.t)) => unit
334327
) =>
335-
destroy_done
328+
unit
336329
)
337330
=?,
338331
~final: [@bs.this] (
339332
(
340333
objStream('w),
341-
~callback: (~error: option(Js.Exn.t)) => final_done
334+
~callback: (~error: option(Js.Exn.t)) => unit
342335
) =>
343-
final_done
336+
unit
344337
)
345338
=?,
346339
~writev: [@bs.this] (
347340
(
348341
objStream('w),
349342
~data: array(chunk('w)),
350343
~encoding: StringEncoding.t,
351-
~callback: (~error: option(Js.Exn.t)) => writev_done
344+
~callback: (~error: option(Js.Exn.t)) => unit
352345
) =>
353-
writev_done
346+
unit
354347
)
355348
=?,
356349
~write: [@bs.this] (
357350
(
358351
objStream('w),
359352
~data: 'w,
360353
~encoding: StringEncoding.t,
361-
~callback: (~error: option(Js.Exn.t)) => write_done
354+
~callback: (~error: option(Js.Exn.t)) => unit
362355
) =>
363-
write_done
356+
unit
364357
),
365358
unit
366359
) =>
@@ -574,9 +567,9 @@ module Readable = {
574567
(
575568
t('r),
576569
~error: Js.nullable(Js.Exn.t),
577-
~callback: (~error: option(Js.Exn.t)) => destroy_done
570+
~callback: (~error: option(Js.Exn.t)) => unit
578571
) =>
579-
destroy_done
572+
unit
580573
),
581574
~read: [@bs.this] ((t('r), ~size: Js.nullable(int)) => unit),
582575
unit
@@ -597,9 +590,9 @@ module Readable = {
597590
(
598591
objStream('r),
599592
~error: Js.nullable(Js.Exn.t),
600-
~callback: (~error: option(Js.Exn.t)) => destroy_done
593+
~callback: (~error: option(Js.Exn.t)) => unit
601594
) =>
602-
destroy_done
595+
unit
603596
),
604597
~read: [@bs.this] ((objStream('r), ~size: Js.nullable(int)) => unit),
605598
unit
@@ -641,28 +634,28 @@ module Duplex = {
641634
(
642635
t('w, 'r),
643636
~error: Js.nullable(Js.Exn.t),
644-
~callback: (~error: option(Js.Exn.t)) => destroy_done
637+
~callback: (~error: option(Js.Exn.t)) => unit
645638
) =>
646-
destroy_done
639+
unit
647640
)
648641
=?,
649642
~final: [@bs.this] (
650643
(
651644
t('w, 'r),
652645
~data: 'w,
653-
~callback: (~error: option(Js.Exn.t)) => final_done
646+
~callback: (~error: option(Js.Exn.t)) => unit
654647
) =>
655-
final_done
648+
unit
656649
)
657650
=?,
658651
~writev: [@bs.this] (
659652
(
660653
t('w, 'r),
661654
~data: array(chunk('w)),
662655
~encoding: StringEncoding.t,
663-
~callback: (~error: option(Js.Exn.t)) => writev_done
656+
~callback: (~error: option(Js.Exn.t)) => unit
664657
) =>
665-
writev_done
658+
unit
666659
)
667660
=?,
668661
~read: [@bs.this] ((t('w, 'r), ~size: Js.nullable(int)) => unit),
@@ -671,9 +664,9 @@ module Duplex = {
671664
t('w, 'r),
672665
~data: 'w,
673666
~encoding: StringEncoding.t,
674-
~callback: (~error: option(Js.Exn.t)) => write_done
667+
~callback: (~error: option(Js.Exn.t)) => unit
675668
) =>
676-
write_done
669+
unit
677670
),
678671
unit
679672
) =>
@@ -696,27 +689,27 @@ module Duplex = {
696689
(
697690
objStream('w, 'r),
698691
~error: Js.nullable(Js.Exn.t),
699-
~callback: (~error: option(Js.Exn.t)) => destroy_done
692+
~callback: (~error: option(Js.Exn.t)) => unit
700693
) =>
701-
destroy_done
694+
unit
702695
)
703696
=?,
704697
~final: [@bs.this] (
705698
(
706699
objStream('w, 'r),
707-
~callback: (~error: option(Js.Exn.t)) => final_done
700+
~callback: (~error: option(Js.Exn.t)) => unit
708701
) =>
709-
final_done
702+
unit
710703
)
711704
=?,
712705
~writev: [@bs.this] (
713706
(
714707
objStream('w, 'r),
715708
~data: array(chunk('w)),
716709
~encoding: StringEncoding.t,
717-
~callback: (~error: option(Js.Exn.t)) => writev_done
710+
~callback: (~error: option(Js.Exn.t)) => unit
718711
) =>
719-
writev_done
712+
unit
720713
)
721714
=?,
722715
~read: [@bs.this] (
@@ -727,9 +720,9 @@ module Duplex = {
727720
objStream('w, 'r),
728721
~data: 'w,
729722
~encoding: StringEncoding.t,
730-
~callback: (~error: option(Js.Exn.t)) => write_done
723+
~callback: (~error: option(Js.Exn.t)) => unit
731724
) =>
732-
write_done
725+
unit
733726
),
734727
unit
735728
) =>
@@ -772,17 +765,17 @@ module Transform = {
772765
~error: option(Js.Exn.t),
773766
~data: option('r)
774767
) =>
775-
transform_done
768+
unit
776769
) =>
777-
transform_done
770+
unit
778771
),
779772
~flush: [@bs.this] (
780773
(
781774
t('w, 'r),
782775
~callback: (~error: option(Js.Exn.t), ~data: option('r)) =>
783-
flush_done
776+
unit
784777
) =>
785-
flush_done
778+
unit
786779
),
787780
unit
788781
) =>
@@ -809,17 +802,17 @@ module Transform = {
809802
~error: option(Js.Exn.t),
810803
~data: option('r)
811804
) =>
812-
transform_done
805+
unit
813806
) =>
814-
transform_done
807+
unit
815808
),
816809
~flush: [@bs.this] (
817810
(
818811
objStream('w, 'r),
819812
~callback: (~error: option(Js.Exn.t), ~data: option('r)) =>
820-
flush_done
813+
unit
821814
) =>
822-
flush_done
815+
unit
823816
),
824817
unit
825818
) =>

0 commit comments

Comments
 (0)