Merge pull request #242 from compio-rs/dependabot/cargo/block2-0.5.0

build(deps): update block2 requirement from 0.4.0 to 0.5.0

Author: Berrysoft

compio-runtime/Cargo.toml

@@ -57,7 +57,7 @@ windows-sys = { workspace = true, features = ["Win32_UI_WindowsAndMessaging"] }
 
 [target.'cfg(target_os = "macos")'.dev-dependencies]
 core-foundation = "0.9.4"
-block2 = "0.4.0"
+block2 = "0.5.0"
 
 [target.'cfg(not(any(windows, target_os = "macos")))'.dev-dependencies]
 glib = "0.19"

compio-runtime/tests/custom_loop.rs

@@ -1,9 +1,14 @@
 #[cfg(target_os = "macos")]
 #[test]
 fn cf_run_loop() {
-    use std::{future::Future, os::raw::c_void, time::Duration};
+    use std::{
+        future::Future,
+        os::raw::c_void,
+        sync::{Arc, Mutex},
+        time::Duration,
+    };
 
-    use block2::{Block, ConcreteBlock};
+    use block2::{Block, StackBlock};
     use compio_driver::AsRawFd;
     use compio_runtime::{event::Event, Runtime};
     use core_foundation::{
@@ -70,11 +75,12 @@ fn cf_run_loop() {
         compio_runtime::time::sleep(Duration::from_secs(1)).await;
 
         let event = Event::new();
-        let block = ConcreteBlock::new(|| {
-            event.handle().notify();
+        let handle = Arc::new(Mutex::new(Some(event.handle())));
+        let block = StackBlock::new(move || {
+            handle.lock().unwrap().take().unwrap().notify();
         });
         extern "C" {
-            fn CFRunLoopPerformBlock(rl: CFRunLoopRef, mode: CFStringRef, block: &Block<(), ()>);
+            fn CFRunLoopPerformBlock(rl: CFRunLoopRef, mode: CFStringRef, block: &Block<dyn Fn()>);
         }
         let run_loop = CFRunLoop::get_current();
         unsafe {