fix clippy

Author: loongs-zhang

core/src/net/operator/windows/mod.rs

@@ -2,7 +2,7 @@ use crate::common::constants::SyscallName;
 use crate::common::{get_timeout_time, now};
 use crate::impl_display_by_debug;
 use std::ffi::{c_int, c_longlong, c_uint};
-use std::io::{Error, ErrorKind};
+use std::io::ErrorKind;
 use std::marker::PhantomData;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::{Duration, Instant};
@@ -239,7 +239,7 @@ impl<'o> Operator<'o> {
                 &mut sock_info_len,
             ) != 0
             {
-                return Err(Error::new(ErrorKind::Other, "get socket info failed"));
+                return Err(Error::other("get socket info failed"));
             }
             self.add_handle(fd as HANDLE)?;
             let socket = WSASocketW(
@@ -251,10 +251,7 @@ impl<'o> Operator<'o> {
                 WSA_FLAG_OVERLAPPED,
             );
             if INVALID_SOCKET == socket {
-                return Err(Error::new(
-                    ErrorKind::Other,
-                    format!("add {syscall_name} operation failed"),
-                ));
+                return Err(Error::other(format!("add {syscall_name} operation failed")));
             }
             let size = size_of::<SOCKADDR_IN>()
                 .saturating_add(16)
@@ -370,10 +367,9 @@ impl<'o> Operator<'o> {
             {
                 let errno = WSAGetLastError();
                 if WSA_IO_PENDING != errno {
-                    return Err(Error::new(
-                        ErrorKind::Other,
-                        format!("add {syscall_name} operation failed with {errno}"),
-                    ));
+                    return Err(Error::other(format!(
+                        "add {syscall_name} operation failed with {errno}"
+                    )));
                 }
             }
             eprintln!("add {syscall_name} operation:{overlapped}");
@@ -464,10 +460,9 @@ impl<'o> Operator<'o> {
             {
                 let errno = WSAGetLastError();
                 if WSA_IO_PENDING != errno {
-                    return Err(Error::new(
-                        ErrorKind::Other,
-                        format!("add {syscall_name} operation failed with {errno}"),
-                    ));
+                    return Err(Error::other(format!(
+                        "add {syscall_name} operation failed with {errno}"
+                    )));
                 }
             }
             eprintln!("add {syscall_name} operation:{overlapped}");

core/tests/coroutine.rs

@@ -23,10 +23,7 @@ fn coroutine_panic() -> std::io::Result<()> {
     })?;
     match coroutine.resume()? {
         CoroutineState::Error(_) => Ok(()),
-        _ => Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "The coroutine should panic",
-        )),
+        _ => Err(std::io::Error::other("The coroutine should panic")),
     }
 }
 
@@ -233,8 +230,7 @@ fn coroutine_preemptive() -> std::io::Result<()> {
         )
         .unwrap();
     if result.1.timed_out() {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
+        Err(std::io::Error::other(
             "The monitor should send signals to coroutines in running state",
         ))
     } else {
@@ -279,8 +275,7 @@ fn coroutine_syscall_not_preemptive() -> std::io::Result<()> {
     if result.1.timed_out() {
         Ok(())
     } else {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
+        Err(std::io::Error::other(
             "The monitor should not send signals to coroutines in syscall state",
         ))
     }

hook/src/syscall/windows.rs

@@ -1,5 +1,5 @@
 use std::ffi::{c_int, c_longlong, c_uint, c_void};
-use std::io::{Error, ErrorKind};
+use std::io::Error;
 use windows_sys::core::{PCSTR, PCWSTR, PSTR};
 use windows_sys::Win32::Foundation::{BOOL, HANDLE, TRUE};
 use windows_sys::Win32::Networking::WinSock::{
@@ -89,6 +89,5 @@ unsafe fn attach() -> std::io::Result<()> {
     // impl_hook!("api-ms-win-core-synch-l1-2-0.dll", WAITONADDRESS, WaitOnAddress(address: *const c_void, compareaddress: *const c_void, addresssize: usize, dwmilliseconds: c_uint) -> BOOL);
 
     // Enable the hook
-    minhook::MinHook::enable_all_hooks()
-        .map_err(|_| Error::new(ErrorKind::Other, "init all hooks failed !"))
+    minhook::MinHook::enable_all_hooks().map_err(|_| Error::other("init all hooks failed !"))
 }

open-coroutine/examples/file_co.rs

@@ -42,8 +42,5 @@ pub fn main() -> Result<()> {
     if let Some(r) = join_handle.timeout_join(Duration::from_secs(30))? {
         return r;
     }
-    Err(Error::new(
-        std::io::ErrorKind::Other,
-        "Failed to join the task",
-    ))
+    Err(Error::other("Failed to join the task"))
 }

open-coroutine/examples/preemptive.rs

@@ -74,8 +74,7 @@ pub fn main() -> std::io::Result<()> {
                 )
                 .unwrap();
             if result.1.timed_out() {
-                Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
+                Err(std::io::Error::other(
                     "preemptive schedule failed",
                 ))
             } else {

open-coroutine/examples/socket_co.rs

@@ -1,5 +1,5 @@
 use open_coroutine::task;
-use std::io::{Error, ErrorKind, IoSlice, IoSliceMut, Read, Write};
+use std::io::{Error, IoSlice, IoSliceMut, Read, Write};
 use std::net::{Shutdown, TcpListener, ToSocketAddrs};
 #[cfg(unix)]
 use std::os::fd::AsRawFd;
@@ -175,8 +175,7 @@ pub fn main() -> std::io::Result<()> {
         )
         .unwrap();
     if result.1.timed_out() {
-        Err(Error::new(
-            ErrorKind::Other,
+        Err(Error::other(
             "The coroutine server and coroutine client did not completed within the specified time",
         ))
     } else {

open-coroutine/examples/socket_co_client.rs

@@ -1,5 +1,5 @@
 use open_coroutine::task;
-use std::io::{Error, ErrorKind, IoSlice, IoSliceMut, Read, Write};
+use std::io::{Error, IoSlice, IoSliceMut, Read, Write};
 use std::net::{Shutdown, TcpListener, ToSocketAddrs};
 #[cfg(unix)]
 use std::os::fd::AsRawFd;
@@ -170,8 +170,7 @@ pub fn main() -> std::io::Result<()> {
         )
         .unwrap();
     if result.1.timed_out() {
-        Err(Error::new(
-            ErrorKind::Other,
+        Err(Error::other(
             "The coroutine client did not completed within the specified time",
         ))
     } else {

open-coroutine/examples/socket_co_server.rs

@@ -1,5 +1,5 @@
 use open_coroutine::task;
-use std::io::{Error, ErrorKind, IoSlice, IoSliceMut, Read, Write};
+use std::io::{Error, IoSlice, IoSliceMut, Read, Write};
 use std::net::{Shutdown, TcpListener, ToSocketAddrs};
 #[cfg(unix)]
 use std::os::fd::AsRawFd;
@@ -172,8 +172,7 @@ pub fn main() -> std::io::Result<()> {
         )
         .unwrap();
     if result.1.timed_out() {
-        Err(Error::new(
-            ErrorKind::Other,
+        Err(Error::other(
             "The coroutine service did not completed within the specified time",
         ))
     } else {

open-coroutine/examples/socket_not_co.rs

@@ -1,4 +1,4 @@
-use std::io::{Error, ErrorKind, IoSlice, IoSliceMut, Read, Write};
+use std::io::{Error, IoSlice, IoSliceMut, Read, Write};
 use std::net::{Shutdown, TcpListener, ToSocketAddrs};
 #[cfg(unix)]
 use std::os::fd::AsRawFd;
@@ -166,8 +166,7 @@ pub fn main() -> std::io::Result<()> {
         )
         .unwrap();
     if result.1.timed_out() {
-        Err(Error::new(
-            ErrorKind::Other,
+        Err(Error::other(
             "The service did not completed within the specified time",
         ))
     } else {