fix small bugs

Author: timzaak

ForTunCli/src/device_ops.rs

@@ -1,11 +1,11 @@
 use std::ffi::c_void;
 use std::mem::{size_of, zeroed};
 use std::net::IpAddr;
+use std::path::Path;
 use std::process::Command;
 
 use anyhow::{anyhow, bail, Context};
 use cidr_utils::cidr::IpCidr;
-use std::fs::Path;
 use std::thread::sleep;
 use std::time::Duration;
 use version_compare::Version;
@@ -176,8 +176,8 @@ pub fn init_device<T:AsRef<Path>>(
     Ok(device)
 }
 
-fn install_driver(inf_path: &str) -> anyhow::Result<()> {
-    let inf_path = HSTRING::from(inf_path);
+fn install_driver<T:AsRef<Path>>(inf_path: T) -> anyhow::Result<()> {
+    let inf_path = HSTRING::from(inf_path.as_ref());
     let inf_path = PCWSTR(inf_path.as_ptr());
 
     let ret = unsafe {

ForTunCli/src/lib.rs

@@ -1,14 +1,14 @@
 mod device_ops;
 pub mod overlapped_file;
 
+use std::path::Path;
 use crate::overlapped_file::WinOverlappedFile;
 use anyhow::bail;
 pub use device_ops::get_net_index;
 pub use device_ops::init_device;
 pub use device_ops::net_config;
 pub use device_ops::AdapterDevice;
 use std::sync::Arc;
-use std::fs::Path;
 use tokio::io;
 use windows::core::GUID;
 use windows::Win32::Foundation::CloseHandle;