From 64f888d3640df052cff4b52963877eca05bde463 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Tue, 26 May 2020 13:26:07 -0500 Subject: [PATCH] fix/cp ~ update to correct current WinAPI usage (ref #1496) --- src/uu/cp/Cargo.toml | 3 +-- src/uu/cp/src/cp.rs | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/uu/cp/Cargo.toml b/src/uu/cp/Cargo.toml index 7460b948d..76b414aa5 100644 --- a/src/uu/cp/Cargo.toml +++ b/src/uu/cp/Cargo.toml @@ -31,8 +31,7 @@ walkdir = "2.2.8" ioctl-sys = "0.5.2" [target.'cfg(target_os = "windows")'.dependencies] -kernel32-sys = "0.2.2" -winapi = "0.3" +winapi = { version="0.3", features=["fileapi"] } [target.'cfg(unix)'.dependencies] xattr="0.2.1" diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index 8b65602cf..224165c05 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -22,14 +22,12 @@ extern crate walkdir; #[cfg(unix)] extern crate xattr; -#[cfg(windows)] -extern crate kernel32; -#[cfg(windows)] -use kernel32::CreateFileW; -#[cfg(windows)] -use kernel32::GetFileInformationByHandle; #[cfg(windows)] extern crate winapi; +#[cfg(windows)] +use winapi::um::fileapi::CreateFileW; +#[cfg(windows)] +use winapi::um::fileapi::GetFileInformationByHandle; use clap::{App, Arg, ArgMatches}; use filetime::FileTime;