Skip to content

Commit be13917

Browse files
committed
simplify a bit
1 parent 4d7a3cf commit be13917

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/tink/core/Future.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ abstract Future<T>(FutureObject<T>) from FutureObject<T> to FutureObject<T> from
342342
*/
343343

344344
@:op(a && b) public function and<B>(b:Future<B>):Future<Pair<T, B>>
345-
return abstract.merge(b, Pair.new);
345+
return merge(b, Pair.new);
346346

347347
@:deprecated('>> for futures is deprecated') @:op(a >> b) static function _tryFailingFlatMap<D, F, R>(f:Surprise<D, F>, map:D->Surprise<R, F>)
348348
return f.flatMap(function (o) return switch o {

src/tink/core/Promise.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ abstract Promise<T>(Surprise<T, Error>) from Surprise<T, Error> to Surprise<T, E
103103
return new Promise((res, rej) -> {f(res, rej); null;});
104104

105105
@:op(a && b) public function and<B>(b:Promise<B>):Promise<Pair<T, B>>
106-
return abstract.merge(b, Pair.new);
106+
return merge(b, Pair.new);
107107

108108
/**
109109
* Given an Iterable (e.g. Array) of Promises, handle them one by one with the `yield` function until one of them yields `Some` value

0 commit comments

Comments
 (0)