fix compile on rust 1.83.0

Author: loongs-zhang

.github/workflows/ci.yml

@@ -86,7 +86,7 @@ jobs:
           x86_64-pc-windows-msvc,
           i686-pc-windows-msvc,
         ]
-        channel: [ 1.81.0, nightly-2024-08-02 ]
+        channel: [ stable, nightly ]
         include:
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest

core/src/syscall/windows/select.rs

@@ -97,7 +97,7 @@ impl<I: SelectSyscall> SelectSyscall for NioSelectSyscall<I> {
             }
             _ = EventLoops::wait_event(Some(Duration::from_millis(u64::from(t.min(x)))));
             if t != c_uint::MAX {
-                t = if t > x { t - x } else { 0 };
+                t = t.saturating_sub(x);
             }
             if x < 16 {
                 x <<= 1;

open-coroutine/build.rs

@@ -1,6 +1,5 @@
 use cargo_metadata::MetadataCommand;
 use std::env::var;
-use std::fs::{copy, read_dir};
 use std::path::PathBuf;
 use tracing::{info, Level};
 use tracing_appender::rolling::{RollingFileAppender, Rotation};
@@ -75,7 +74,7 @@ fn main() {
             .join("registry")
             .join("src");
         let crates_parent_dirs = Vec::from_iter(
-            read_dir(dep_src_dir.clone())
+            std::fs::read_dir(dep_src_dir.clone())
                 .expect("Failed to read deps")
                 .flatten(),
         );
@@ -164,55 +163,12 @@ fn main() {
     {
         panic!("failed to build dylib {}", e);
     }
-    // correct dylib path
-    let hook_deps = out_dir
-        .join(target)
-        .join(if cfg!(debug_assertions) {
-            "debug"
-        } else {
-            "release"
-        })
-        .join("deps");
-    let deps = out_dir
-        .parent()
-        .expect("can not find deps dir")
-        .parent()
-        .expect("can not find deps dir")
-        .parent()
-        .expect("can not find deps dir")
-        .join("deps");
-    for entry in read_dir(hook_deps.clone())
-        .expect("can not find deps dir")
-        .flatten()
-    {
-        let file_name = entry.file_name().to_string_lossy().to_string();
-        if !file_name.contains("open_coroutine_hook") {
-            continue;
-        }
-        if cfg!(target_os = "linux") && file_name.ends_with(".so") {
-            let from = hook_deps.join(file_name);
-            let to = deps.join("libopen_coroutine_hook.so");
-            copy(from.clone(), to.clone()).expect("copy to libopen_coroutine_hook.so failed!");
-            info!("copy {:?} to {:?} success!", from, to);
-        } else if cfg!(target_os = "macos") && file_name.ends_with(".dylib") {
-            let from = hook_deps.join(file_name);
-            let to = deps.join("libopen_coroutine_hook.dylib");
-            copy(from.clone(), to.clone()).expect("copy to libopen_coroutine_hook.dylib failed!");
-            info!("copy {:?} to {:?} success!", from, to);
-        } else if cfg!(windows) {
-            if file_name.ends_with(".dll") {
-                let from = hook_deps.join(file_name);
-                let to = deps.join("open_coroutine_hook.dll");
-                copy(from.clone(), to.clone()).expect("copy to open_coroutine_hook.dll failed!");
-                info!("copy {:?} to {:?} success!", from, to);
-            } else if file_name.ends_with(".lib") {
-                let from = hook_deps.join(file_name);
-                let to = deps.join("open_coroutine_hook.lib");
-                copy(from.clone(), to.clone()).expect("copy to open_coroutine_hook.lib failed!");
-                info!("copy {:?} to {:?} success!", from, to);
-            }
-        }
-    }
     // link dylib
+    let hook_deps = out_dir.join(target).join(if cfg!(debug_assertions) {
+        "debug"
+    } else {
+        "release"
+    });
+    println!("cargo:rustc-link-search=native={}", hook_deps.display());
     println!("cargo:rustc-link-lib=dylib=open_coroutine_hook");
 }