Skip to content

Commit 1b30c0b

Browse files
committed
Update to latest fiber
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
1 parent d72f054 commit 1b30c0b

File tree

20 files changed

+628
-517
lines changed

20 files changed

+628
-517
lines changed

fiber-test/fiber_test.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ let test ?(expect_never = false) to_dyn f =
4343
let never_raised = ref false in
4444
let f =
4545
let on_error exn =
46-
Format.eprintf "%a@." Exn_with_backtrace.pp_uncaught exn
46+
Format.eprintf "%a@." Exn_with_backtrace.pp_uncaught exn;
47+
Fiber.return ()
4748
in
4849
Fiber.with_error_handler (fun () -> f) ~on_error
4950
in

fiber-unix/src/fiber_detached.ml

Lines changed: 0 additions & 47 deletions
This file was deleted.

fiber-unix/src/fiber_detached.mli

Lines changed: 0 additions & 11 deletions
This file was deleted.

fiber-unix/src/fiber_stream.ml

Lines changed: 0 additions & 89 deletions
This file was deleted.

fiber-unix/src/fiber_stream.mli

Lines changed: 0 additions & 41 deletions
This file was deleted.

fiber-unix/src/fiber_unix.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
module Fiber_detached = Fiber_detached
2-
module Fiber_stream = Fiber_stream
31
module Scheduler = Scheduler
42

53
module Private = struct

fiber-unix/test/fiber_detached_tests.ml

Lines changed: 0 additions & 29 deletions
This file was deleted.

fiber-unix/test/fiber_stream_tests.ml

Lines changed: 0 additions & 93 deletions
This file was deleted.

fiber-unix/test/scheduler_tests.ml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
open! Import
22
open Fiber.O
33
module S = Fiber_unix.Scheduler
4-
module Fiber_detached = Fiber_unix.Fiber_detached
54

65
let test s f =
76
let f =
87
Fiber.with_error_handler f ~on_error:(fun exn ->
9-
Format.printf "%a@." Exn_with_backtrace.pp_uncaught exn)
8+
Format.printf "%a@." Exn_with_backtrace.pp_uncaught exn;
9+
Fiber.return ())
1010
in
1111
S.run s f
1212

@@ -162,13 +162,13 @@ let%expect_test "tests rescheduling" =
162162

163163
let%expect_test "detached + timer" =
164164
let s = S.create () in
165-
let detached = Fiber_detached.create () in
165+
let detached = Fiber.Pool.create () in
166166
let timer = S.create_timer s ~delay:0.05 in
167167
let run () =
168168
Fiber.fork_and_join_unit
169169
(fun () ->
170170
let* () =
171-
Fiber_detached.task_exn detached ~f:(fun () ->
171+
Fiber.Pool.task detached ~f:(fun () ->
172172
let* res =
173173
S.schedule timer (fun () ->
174174
print_endline "inside timer";
@@ -178,8 +178,8 @@ let%expect_test "detached + timer" =
178178
| Ok () -> Fiber.return (print_endline "timer finished")
179179
| Error `Cancelled -> assert false)
180180
in
181-
Fiber_detached.stop detached)
182-
(fun () -> Fiber_detached.run detached)
181+
Fiber.Pool.stop detached)
182+
(fun () -> Fiber.Pool.run detached)
183183
in
184184
test s run;
185185
[%expect {|

0 commit comments

Comments
 (0)