Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust to tink_stream#simplify #22

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adjust to tink_stream#simplify #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20d4bf4
Adjust to tink_stream#simplify
kevinresol Jul 17, 2021
e8f7002
bump libs
kevinresol Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions haxe_libraries/tink_chunk.hxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @install: lix --silent download "gh://github.com/haxetink/tink_chunk#d58e35ce6985a9e40e76a9771e8eee30c6efa5aa" into tink_chunk/0.4.0/github/d58e35ce6985a9e40e76a9771e8eee30c6efa5aa
-cp ${HAXE_LIBCACHE}/tink_chunk/0.4.0/github/d58e35ce6985a9e40e76a9771e8eee30c6efa5aa/src
# @install: lix --silent download "gh://github.com/haxetink/tink_chunk#f178d47593e42ba184af2eb88db4f8f1f554dbf3" into tink_chunk/0.4.0/github/f178d47593e42ba184af2eb88db4f8f1f554dbf3
-cp ${HAXE_LIBCACHE}/tink_chunk/0.4.0/github/f178d47593e42ba184af2eb88db4f8f1f554dbf3/src
-D tink_chunk=0.4.0
4 changes: 2 additions & 2 deletions haxe_libraries/tink_cli.hxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# @install: lix --silent download "gh://github.com/haxetink/tink_cli#1278ad2a34fd5e2403e414aefe09bb938d0c8825" into tink_cli/0.5.1/github/1278ad2a34fd5e2403e414aefe09bb938d0c8825
# @install: lix --silent download "gh://github.com/haxetink/tink_cli#c9124f9be04baca0cd55f06237a0a9fffb6287dc" into tink_cli/0.5.1/github/c9124f9be04baca0cd55f06237a0a9fffb6287dc
-lib tink_io
-lib tink_macro
-lib tink_stringly
-cp ${HAXE_LIBCACHE}/tink_cli/0.5.1/github/1278ad2a34fd5e2403e414aefe09bb938d0c8825/src
-cp ${HAXE_LIBCACHE}/tink_cli/0.5.1/github/c9124f9be04baca0cd55f06237a0a9fffb6287dc/src
-D tink_cli=0.5.1
# Make sure docs are generated
-D use-rtti-doc
6 changes: 3 additions & 3 deletions haxe_libraries/tink_core.hxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @install: lix --silent download "gh://github.com/haxetink/tink_core#abee932c4e724517090238b6527eac28874c0354" into tink_core/1.27.1/github/abee932c4e724517090238b6527eac28874c0354
-cp ${HAXE_LIBCACHE}/tink_core/1.27.1/github/abee932c4e724517090238b6527eac28874c0354/src
-D tink_core=1.27.1
# @install: lix --silent download "gh://github.com/haxetink/tink_core#670bc1d256a657cee2e78e3554d7effe31c3682d" into tink_core/2.1.1/github/670bc1d256a657cee2e78e3554d7effe31c3682d
-cp ${HAXE_LIBCACHE}/tink_core/2.1.1/github/670bc1d256a657cee2e78e3554d7effe31c3682d/src
-D tink_core=2.1.1
6 changes: 3 additions & 3 deletions haxe_libraries/tink_io.hxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# @install: lix --silent download "gh://github.com/haxetink/tink_io#ea6c6eec70f480082c6d8c4deed1cda4ae805fcf" into tink_io/0.8.0/github/ea6c6eec70f480082c6d8c4deed1cda4ae805fcf
# @install: lix --silent download "gh://github.com/haxetink/tink_io#e75bd9d718eda4fea58a49de952fd5439e336d81" into tink_io/0.9.0/github/e75bd9d718eda4fea58a49de952fd5439e336d81
-lib tink_chunk
-lib tink_streams
-cp ${HAXE_LIBCACHE}/tink_io/0.8.0/github/ea6c6eec70f480082c6d8c4deed1cda4ae805fcf/src
-D tink_io=0.8.0
-cp ${HAXE_LIBCACHE}/tink_io/0.9.0/github/e75bd9d718eda4fea58a49de952fd5439e336d81/src
-D tink_io=0.9.0
6 changes: 3 additions & 3 deletions haxe_libraries/tink_macro.hxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @install: lix --silent download "gh://github.com/haxetink/tink_macro#f1010a518fdefb484eaff8727ff022ba51658e53" into tink_macro/0.23.0/github/f1010a518fdefb484eaff8727ff022ba51658e53
# @install: lix --silent download "gh://github.com/haxetink/tink_macro#990096cfd58edf3411c74672719ab517ec389810" into tink_macro/1.0.3/github/990096cfd58edf3411c74672719ab517ec389810
-lib tink_core
-cp ${HAXE_LIBCACHE}/tink_macro/0.23.0/github/f1010a518fdefb484eaff8727ff022ba51658e53/src
-D tink_macro=0.23.0
-cp ${HAXE_LIBCACHE}/tink_macro/1.0.3/github/990096cfd58edf3411c74672719ab517ec389810/src
-D tink_macro=1.0.3
8 changes: 3 additions & 5 deletions haxe_libraries/tink_streams.hxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# @install: lix --silent download "gh://github.com/haxetink/tink_streams#5066a96c4a8b483479b6a8df8893eaf8922d3bea" into tink_streams/0.4.0/github/5066a96c4a8b483479b6a8df8893eaf8922d3bea
# @install: lix --silent download "gh://github.com/haxetink/tink_streams#aa8a05f7a82e5b881ae3bf8df4aa219bd56fec0f" into tink_streams/0.3.3/github/aa8a05f7a82e5b881ae3bf8df4aa219bd56fec0f
-lib tink_core
-cp ${HAXE_LIBCACHE}/tink_streams/0.4.0/github/5066a96c4a8b483479b6a8df8893eaf8922d3bea/src
-D tink_streams=0.4.0
# temp for development, delete this file when pure branch merged
-D pure
-cp ${HAXE_LIBCACHE}/tink_streams/0.3.3/github/aa8a05f7a82e5b881ae3bf8df4aa219bd56fec0f/src
-D tink_streams=0.3.3
6 changes: 3 additions & 3 deletions haxe_libraries/tink_stringly.hxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @install: lix --silent download "gh://github.com/haxetink/tink_stringly#38fcef46679d45bdfc33fe31f341d8d0787cc98c" into tink_stringly/0.5.0/github/38fcef46679d45bdfc33fe31f341d8d0787cc98c
# @install: lix --silent download "gh://github.com/haxetink/tink_stringly#b81c058560ef979786a2f8711803e1c47a827df3" into tink_stringly/0.6.0/github/b81c058560ef979786a2f8711803e1c47a827df3
-lib tink_core
-cp ${HAXE_LIBCACHE}/tink_stringly/0.5.0/github/38fcef46679d45bdfc33fe31f341d8d0787cc98c/src
-D tink_stringly=0.5.0
-cp ${HAXE_LIBCACHE}/tink_stringly/0.6.0/github/b81c058560ef979786a2f8711803e1c47a827df3/src
-D tink_stringly=0.6.0
12 changes: 7 additions & 5 deletions src/tink/testrunner/Assertions.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ abstract Assertions(Impl) from Impl to Impl {

@:from
public static function ofSurpriseAssertion(p:Surprise<Assertion, Error>):Assertions {
return Stream.future(p.map(function(o):Stream<Dynamic, Dynamic> return switch o {
case Success(a): Stream.single(a);
case Failure(e): Stream.ofError(e);
}));
return ofPromiseAssertion(p);
}

@:from
public static inline function ofPromiseAssertion(p:Promise<Assertion>):Assertions {
return Stream.promise(p.next(assertion -> Stream.single(assertion)));
}

@:from
Expand All @@ -51,7 +53,7 @@ abstract Assertions(Impl) from Impl to Impl {

@:from
public static inline function ofPromiseAssertions(p:Promise<Assertions>):Assertions {
return ofSurpriseAssertions(p);
return Stream.promise(p);
}

@:from
Expand Down
8 changes: 4 additions & 4 deletions src/tink/testrunner/Runner.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ class Runner {
var assertions = [];
return caze.execute().forEach(function(a) {
assertions.push(a);
return reporter.report(Assertion(a)).map(function(_) return Resume);
return reporter.report(Assertion(a)).swap(None);
})
.next(function(o):Outcome<Array<Assertion>, Error> return switch o {
case Depleted: Success(assertions);
case Halted(_): throw 'unreachable';
case Failed(e): Failure(e);
case Done: Success(assertions);
case Stopped(_): throw 'unreachable';
case Failed(_, e): Failure(e);
})
.timeout(caze.timeout, timers);
})
Expand Down
Loading