Avoid Fun.protect, because it doesn't know about cancelation

Author: polytypic

test/dune

@@ -47,6 +47,7 @@
   alcotest
   domain_shims
   picos_std.event
+  picos_std.finally
   picos_std.structured
   picos_std.sync
   test_scheduler
@@ -248,6 +249,7 @@
   alcotest
   picos
   picos_aux.mpscq
+  picos_std.finally
   picos_std.structured
   picos_std.sync
   test_scheduler

test/test_structured.ml

@@ -1,4 +1,5 @@
 open Picos_std_event
+open Picos_std_finally
 open Picos_std_structured
 open Picos_std_sync
 module Mpscq = Picos_aux_mpscq
@@ -8,11 +9,11 @@ let check join_after ?callstack ?on_return scope =
   let open Picos in
   let fiber = Fiber.current () in
   let before = Fiber.get_computation fiber in
-  let finally () =
+  let check_computation_was_scoped () =
     let after = Fiber.get_computation fiber in
     assert (before == after)
   in
-  Fun.protect ~finally @@ fun () ->
+  lastly check_computation_was_scoped @@ fun () ->
   join_after ?callstack ?on_return @@ fun bundle ->
   let during = Fiber.get_computation fiber in
   assert (before != during);

test/test_sync.ml

@@ -1,7 +1,8 @@
 open Picos
 open Picos_std_event
-open Picos_std_sync
+open Picos_std_finally
 open Picos_std_structured
+open Picos_std_sync
 
 let msgs = ref []
 let empty_bt = Printexc.get_callstack 0
@@ -131,7 +132,7 @@ let test_mutex_and_condition_cancelation () =
   let hard_deadline = Unix.gettimeofday () +. 120.0 in
 
   let main i () =
-    Fun.protect ~finally:(fun () -> Atomic.decr exit) @@ fun () ->
+    lastly (fun () -> Atomic.decr exit) @@ fun () ->
     Test_scheduler.run @@ fun () ->
     let state = Random.State.make_self_init () in
     let fiber = Fiber.current () in