From 3eade94032d2cf189193999c2febeb6528a80ca8 Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Fri, 18 Mar 2022 16:43:22 -0700 Subject: [PATCH] chore(deps): bump windows-rs from 0.33 to 0.34 --- Cargo.lock | 34 ++++++------ komorebi-core/Cargo.toml | 2 +- komorebi-core/src/arrangement.rs | 13 ++--- komorebi-core/src/default_layout.rs | 2 +- komorebi-core/src/direction.rs | 81 ++++++++++++++--------------- komorebi-core/src/lib.rs | 6 +-- komorebi/Cargo.toml | 2 +- komorebi/src/windows_api.rs | 7 +-- komorebi/src/winevent.rs | 2 + komorebic/Cargo.toml | 2 +- 10 files changed, 73 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4fbd838a..20720e6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1430,15 +1430,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0128fa8e65e0616e45033d68dc0b7fbd521080b7844e5cad3a4a4d201c4b2bd2" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" dependencies = [ - "windows_aarch64_msvc 0.33.0", - "windows_i686_gnu 0.33.0", - "windows_i686_msvc 0.33.0", - "windows_x86_64_gnu 0.33.0", - "windows_x86_64_msvc 0.33.0", + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", ] [[package]] @@ -1481,9 +1481,9 @@ checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" [[package]] name = "windows_aarch64_msvc" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_i686_gnu" @@ -1499,9 +1499,9 @@ checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" [[package]] name = "windows_i686_gnu" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_msvc" @@ -1517,9 +1517,9 @@ checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" [[package]] name = "windows_i686_msvc" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_x86_64_gnu" @@ -1535,9 +1535,9 @@ checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" [[package]] name = "windows_x86_64_gnu" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_msvc" @@ -1553,9 +1553,9 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "windows_x86_64_msvc" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "winput" diff --git a/komorebi-core/Cargo.toml b/komorebi-core/Cargo.toml index 4f951bd2..a7c54fa5 100644 --- a/komorebi-core/Cargo.toml +++ b/komorebi-core/Cargo.toml @@ -15,7 +15,7 @@ strum = { version = "0.24", features = ["derive"] } schemars = "0.8" [dependencies.windows] -version = "0.33" +version = "0.34" features = [ "Win32_Foundation", ] diff --git a/komorebi-core/src/arrangement.rs b/komorebi-core/src/arrangement.rs index 0276ae0d..f79f0ef5 100644 --- a/komorebi-core/src/arrangement.rs +++ b/komorebi-core/src/arrangement.rs @@ -37,16 +37,16 @@ impl Arrangement for DefaultLayout { ) -> Vec { let len = usize::from(len); let mut dimensions = match self { - DefaultLayout::BSP => recursive_fibonacci( + Self::BSP => recursive_fibonacci( 0, len, area, layout_flip, calculate_resize_adjustments(resize_dimensions), ), - DefaultLayout::Columns => columns(area, len), - DefaultLayout::Rows => rows(area, len), - DefaultLayout::VerticalStack => { + Self::Columns => columns(area, len), + Self::Rows => rows(area, len), + Self::VerticalStack => { let mut layouts: Vec = vec![]; let primary_right = match len { @@ -88,7 +88,7 @@ impl Arrangement for DefaultLayout { layouts } - DefaultLayout::HorizontalStack => { + Self::HorizontalStack => { let mut layouts: Vec = vec![]; let bottom = match len { @@ -130,7 +130,7 @@ impl Arrangement for DefaultLayout { layouts } - DefaultLayout::UltrawideVerticalStack => { + Self::UltrawideVerticalStack => { let mut layouts: Vec = vec![]; let primary_right = match len { @@ -475,6 +475,7 @@ fn calculate_resize_adjustments(resize_dimensions: &[Option]) -> Vec bool { match op_direction { OperationDirection::Up => match self { - DefaultLayout::BSP => count > 2 && idx != 0 && idx != 1, - DefaultLayout::Columns => false, - DefaultLayout::Rows | DefaultLayout::HorizontalStack => idx != 0, - DefaultLayout::VerticalStack => idx != 0 && idx != 1, - DefaultLayout::UltrawideVerticalStack => idx > 2, + Self::BSP => count > 2 && idx != 0 && idx != 1, + Self::Columns => false, + Self::Rows | Self::HorizontalStack => idx != 0, + Self::VerticalStack => idx != 0 && idx != 1, + Self::UltrawideVerticalStack => idx > 2, }, OperationDirection::Down => match self { - DefaultLayout::BSP => count > 2 && idx != count - 1 && idx % 2 != 0, - DefaultLayout::Columns => false, - DefaultLayout::Rows => idx != count - 1, - DefaultLayout::VerticalStack => idx != 0 && idx != count - 1, - DefaultLayout::HorizontalStack => idx == 0, - DefaultLayout::UltrawideVerticalStack => idx > 1 && idx != count - 1, + Self::BSP => count > 2 && idx != count - 1 && idx % 2 != 0, + Self::Columns => false, + Self::Rows => idx != count - 1, + Self::VerticalStack => idx != 0 && idx != count - 1, + Self::HorizontalStack => idx == 0, + Self::UltrawideVerticalStack => idx > 1 && idx != count - 1, }, OperationDirection::Left => match self { - DefaultLayout::BSP => count > 1 && idx != 0, - DefaultLayout::Columns | DefaultLayout::VerticalStack => idx != 0, - DefaultLayout::Rows => false, - DefaultLayout::HorizontalStack => idx != 0 && idx != 1, - DefaultLayout::UltrawideVerticalStack => count > 1 && idx != 1, + Self::BSP => count > 1 && idx != 0, + Self::Columns | Self::VerticalStack => idx != 0, + Self::Rows => false, + Self::HorizontalStack => idx != 0 && idx != 1, + Self::UltrawideVerticalStack => count > 1 && idx != 1, }, OperationDirection::Right => match self { - DefaultLayout::BSP => count > 1 && idx % 2 == 0 && idx != count - 1, - DefaultLayout::Columns => idx != count - 1, - DefaultLayout::Rows => false, - DefaultLayout::VerticalStack => idx == 0, - DefaultLayout::HorizontalStack => idx != 0 && idx != count - 1, - DefaultLayout::UltrawideVerticalStack => match count { + Self::BSP => count > 1 && idx % 2 == 0 && idx != count - 1, + Self::Columns => idx != count - 1, + Self::Rows => false, + Self::VerticalStack => idx == 0, + Self::HorizontalStack => idx != 0 && idx != count - 1, + Self::UltrawideVerticalStack => match count { 0 | 1 => false, 2 => idx != 0, _ => idx < 2, @@ -110,45 +110,40 @@ impl Direction for DefaultLayout { fn up_index(&self, idx: usize) -> usize { match self { - DefaultLayout::BSP => { + Self::BSP => { if idx % 2 == 0 { idx - 1 } else { idx - 2 } } - DefaultLayout::Columns => unreachable!(), - DefaultLayout::Rows - | DefaultLayout::VerticalStack - | DefaultLayout::UltrawideVerticalStack => idx - 1, - DefaultLayout::HorizontalStack => 0, + Self::Columns => unreachable!(), + Self::Rows | Self::VerticalStack | Self::UltrawideVerticalStack => idx - 1, + Self::HorizontalStack => 0, } } fn down_index(&self, idx: usize) -> usize { match self { - DefaultLayout::BSP - | DefaultLayout::Rows - | DefaultLayout::VerticalStack - | DefaultLayout::UltrawideVerticalStack => idx + 1, - DefaultLayout::Columns => unreachable!(), - DefaultLayout::HorizontalStack => 1, + Self::BSP | Self::Rows | Self::VerticalStack | Self::UltrawideVerticalStack => idx + 1, + Self::Columns => unreachable!(), + Self::HorizontalStack => 1, } } fn left_index(&self, idx: usize) -> usize { match self { - DefaultLayout::BSP => { + Self::BSP => { if idx % 2 == 0 { idx - 2 } else { idx - 1 } } - DefaultLayout::Columns | DefaultLayout::HorizontalStack => idx - 1, - DefaultLayout::Rows => unreachable!(), - DefaultLayout::VerticalStack => 0, - DefaultLayout::UltrawideVerticalStack => match idx { + Self::Columns | Self::HorizontalStack => idx - 1, + Self::Rows => unreachable!(), + Self::VerticalStack => 0, + Self::UltrawideVerticalStack => match idx { 0 => 1, 1 => unreachable!(), _ => 0, @@ -158,10 +153,10 @@ impl Direction for DefaultLayout { fn right_index(&self, idx: usize) -> usize { match self { - DefaultLayout::BSP | DefaultLayout::Columns | DefaultLayout::HorizontalStack => idx + 1, - DefaultLayout::Rows => unreachable!(), - DefaultLayout::VerticalStack => 1, - DefaultLayout::UltrawideVerticalStack => match idx { + Self::BSP | Self::Columns | Self::HorizontalStack => idx + 1, + Self::Rows => unreachable!(), + Self::VerticalStack => 1, + Self::UltrawideVerticalStack => match idx { 1 => 0, 0 => 2, _ => unreachable!(), diff --git a/komorebi-core/src/lib.rs b/komorebi-core/src/lib.rs index 378f606c..d7548666 100644 --- a/komorebi-core/src/lib.rs +++ b/komorebi-core/src/lib.rs @@ -1,5 +1,5 @@ #![warn(clippy::all, clippy::nursery, clippy::pedantic)] -#![allow(clippy::missing_errors_doc)] +#![allow(clippy::missing_errors_doc, clippy::use_self)] use std::path::PathBuf; use std::str::FromStr; @@ -171,8 +171,8 @@ impl Sizing { #[must_use] pub const fn adjust_by(&self, value: i32, adjustment: i32) -> i32 { match self { - Sizing::Increase => value + adjustment, - Sizing::Decrease => { + Self::Increase => value + adjustment, + Self::Decrease => { if value > 0 && value - adjustment >= 0 { value - adjustment } else { diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml index 23c1b0ef..18ed5b46 100644 --- a/komorebi/Cargo.toml +++ b/komorebi/Cargo.toml @@ -41,7 +41,7 @@ winreg = "0.10" schemars = "0.8" [dependencies.windows] -version = "0.33" +version = "0.34" features = [ "Win32_Foundation", "Win32_Graphics_Dwm", diff --git a/komorebi/src/windows_api.rs b/komorebi/src/windows_api.rs index f7ef07d3..5fa69165 100644 --- a/komorebi/src/windows_api.rs +++ b/komorebi/src/windows_api.rs @@ -1,6 +1,5 @@ use std::collections::VecDeque; use std::convert::TryFrom; -use std::convert::TryInto; use std::ffi::c_void; use color_eyre::eyre::anyhow; @@ -438,9 +437,7 @@ impl WindowsApi { pub fn window_text_w(hwnd: HWND) -> Result { let mut text: [u16; 512] = [0; 512]; - match WindowsResult::from(unsafe { - GetWindowTextW(hwnd, PWSTR(text.as_mut_ptr()), text.len().try_into()?) - }) { + match WindowsResult::from(unsafe { GetWindowTextW(hwnd, &mut text) }) { WindowsResult::Ok(len) => { let length = usize::try_from(len)?; Ok(String::from_utf16(&text[..length])?) @@ -495,7 +492,7 @@ impl WindowsApi { let mut class: [u16; BUF_SIZE] = [0; BUF_SIZE]; let len = Result::from(WindowsResult::from(unsafe { - RealGetWindowClassW(hwnd, PWSTR(class.as_mut_ptr()), u32::try_from(BUF_SIZE)?) + RealGetWindowClassW(hwnd, &mut class) }))?; Ok(String::from_utf16(&class[0..len as usize])?) diff --git a/komorebi/src/winevent.rs b/komorebi/src/winevent.rs index 650215ac..62af825a 100644 --- a/komorebi/src/winevent.rs +++ b/komorebi/src/winevent.rs @@ -1,3 +1,5 @@ +#![allow(clippy::use_self)] + use schemars::JsonSchema; use serde::Serialize; use strum::Display; diff --git a/komorebic/Cargo.toml b/komorebic/Cargo.toml index 35bbbe95..054ed2bc 100644 --- a/komorebic/Cargo.toml +++ b/komorebic/Cargo.toml @@ -27,7 +27,7 @@ serde_json = "1" uds_windows = "1" [dependencies.windows] -version = "0.33" +version = "0.34" features = [ "Win32_Foundation", "Win32_UI_WindowsAndMessaging"