chore: fix clippy & win addrinfo

Author: Chronostasys

immix

@@ -327,7 +327,7 @@ impl Linker for MsvcLinker {
                 "-libpath:{}",
                 p.to_str()
                     .unwrap()
-                    .trim_end_matches(|c| c == '\\')
+                    .trim_end_matches('\\')
                     .replace('\\', r"\\")
             ));
         });

pl_linker/src/linker.rs

@@ -153,9 +153,8 @@ impl FuncCallNode {
             }
             let v = para
                 .emit(ctx, builder)
-                .map(|re| {
+                .inspect(|_| {
                     ctx.expect_ty = None;
-                    re
                 })?
                 .get_value();
             if v.is_none() {

src/ast/node/function.rs

@@ -312,9 +312,8 @@ pub fn prepare_build_envs(db: &dyn Db, kagari_source: SourceProgram) -> Result<C
                     pb.set_message(format!("正在分析依赖{}", k));
                     if PathBuf::from(&v.path).is_absolute() {
                         _ = crate::utils::canonicalize(&v.path)
-                            .map(|p| {
+                            .inspect(|p| {
                                 v.path = p.to_str().unwrap().to_string();
-                                p
                             })
                             .map_err(|e| {
                                 pb.abandon_with_message(format!("error: {:?}", e));
@@ -323,9 +322,8 @@ pub fn prepare_build_envs(db: &dyn Db, kagari_source: SourceProgram) -> Result<C
                             });
                     } else {
                         _ = crate::utils::canonicalize(config_root.join(&v.path))
-                            .map(|p| {
+                            .inspect(|p| {
                                 v.path = p.to_str().unwrap().to_string();
-                                p
                             })
                             .map_err(|e| {
                                 pb.abandon_with_message(format!("error: {:?}", e));

src/utils/read_config.rs

@@ -16,7 +16,7 @@ bytecount = "0.6.3"
 context = "3.0.0"
 thread-priority = "1.2.0"
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["winuser", "wincrypt"] }
+winapi = { version = "0.3", features = ["winuser", "wincrypt", "ws2def"] }
 
 [dev-dependencies]
 rand = "0.8"

vm/Cargo.toml

@@ -69,9 +69,19 @@ impl LibC {
                 .unwrap()
         }
     }
+
+    #[cfg(not(target_os = "windows"))]
     fn addrinfo_ai_addr(ai: *const libc::addrinfo) -> *const libc::sockaddr {
         unsafe { (*ai).ai_addr }
     }
+
+    #[cfg(target_os = "windows")]
+    fn addrinfo_ai_addr(
+        ai: *const winapi::shared::ws2def::ADDRINFOA,
+    ) -> *const winapi::shared::ws2def::SOCKADDR {
+        unsafe { (*ai).ai_addr }
+    }
+
     fn open(path: *const u8, byte_len: i64, flags: libc::c_int) -> libc::c_int {
         // create cstr from ptr and len
         let path = unsafe { std::slice::from_raw_parts(path, byte_len as usize) };