From 014d36b17a4406eb4ef5af0ac86ca5d84f6d2dfd Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Sun, 30 Oct 2022 14:29:41 +0100 Subject: [PATCH] Use nt-api 4 on Windows (#6949) * Bump nushell-sytem dep to ntapi 0.4 0.3.7 trigger a warning about code being incompatible with future rust versions. This is resolved in 0.4 https://github.com/MSxDOS/ntapi/issues/11 * Upgrade Cargo.lock for ntapi 0.4 --- Cargo.lock | 13 ++----------- crates/nu-system/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cda955f3a6..372363cd61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2467,15 +2467,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "ntapi" version = "0.4.0" @@ -2791,7 +2782,7 @@ dependencies = [ "log", "mach2", "nix", - "ntapi 0.3.7", + "ntapi", "once_cell", "procfs", "winapi 0.3.9", @@ -4849,7 +4840,7 @@ dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", "libc", - "ntapi 0.4.0", + "ntapi", "once_cell", "rayon", "winapi 0.3.9", diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml index 9e28195820..8c4d261a8b 100644 --- a/crates/nu-system/Cargo.toml +++ b/crates/nu-system/Cargo.toml @@ -32,5 +32,5 @@ mach2 = "0.4" [target.'cfg(target_os = "windows")'.dependencies] winapi = { version = "0.3.9", features = ["tlhelp32", "fileapi", "handleapi", "ifdef", "ioapiset", "minwindef", "pdh", "psapi", "synchapi", "sysinfoapi", "winbase", "winerror", "winioctl", "winnt", "oleauto", "wbemcli", "rpcdce", "combaseapi", "objidl", "powerbase", "netioapi", "lmcons", "lmaccess", "lmapibuf", "memoryapi", "shellapi", "std", "securitybaseapi"] } chrono = "0.4.21" -ntapi = "0.3" +ntapi = "0.4" once_cell = "1.0"