diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7b5c3eb..62f99dc 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -25,6 +25,10 @@ jobs: run: cargo build --verbose - name: Run tests run: cargo test --verbose + - name: Check Formatting + run: cargo fmt --check + - name: Clippy + run: cargo clippy --all-features --all-targets -- --deny warnings - name: Upload build artifact uses: actions/upload-artifact@v3 with: @@ -41,6 +45,10 @@ jobs: run: cargo build --verbose - name: Run tests run: cargo test --verbose + - name: Check Formatting + run: cargo fmt --check + - name: Clippy + run: cargo clippy --all-features --all-targets -- --deny warnings - name: Upload build artifact uses: actions/upload-artifact@v3 with: @@ -57,6 +65,10 @@ jobs: run: cargo build --verbose - name: Run tests run: cargo test --verbose + - name: Check Formatting + run: cargo fmt --check + - name: Clippy + run: cargo clippy --all-features --all-targets -- --deny warnings - name: Upload build artifact uses: actions/upload-artifact@v3 with: diff --git a/src/backend/consumer/dummy.rs b/src/backend/consumer/dummy.rs index 85cef2f..c441f12 100644 --- a/src/backend/consumer/dummy.rs +++ b/src/backend/consumer/dummy.rs @@ -5,6 +5,7 @@ use crate::{ }; use async_trait::async_trait; +#[derive(Default)] pub struct DummyConsumer; impl DummyConsumer { diff --git a/src/backend/consumer/windows.rs b/src/backend/consumer/windows.rs index 7562c2e..1d96e63 100644 --- a/src/backend/consumer/windows.rs +++ b/src/backend/consumer/windows.rs @@ -1,7 +1,11 @@ +use crate::{ + consumer::EventConsumer, + event::{KeyboardEvent, PointerEvent}, + scancode, +}; use anyhow::Result; -use crate::{consumer::EventConsumer, event::{KeyboardEvent, PointerEvent}, scancode}; use async_trait::async_trait; -use winapi::um::winuser::{KEYEVENTF_EXTENDEDKEY, SendInput}; +use winapi::um::winuser::{SendInput, KEYEVENTF_EXTENDEDKEY}; use winapi::{ self, um::winuser::{ @@ -179,7 +183,7 @@ fn linux_keycode_to_windows_scancode(linux_keycode: u32) -> Option { Err(_) => { log::warn!("unknown keycode: {linux_keycode}"); return None; - }, + } }; log::trace!("linux code: {linux_scancode:?}"); let windows_scancode = match scancode::Windows::try_from(linux_scancode) { diff --git a/src/backend/consumer/x11.rs b/src/backend/consumer/x11.rs index 68438f2..3e1aed5 100644 --- a/src/backend/consumer/x11.rs +++ b/src/backend/consumer/x11.rs @@ -46,7 +46,8 @@ impl X11Consumer { BTN_MIDDLE => 2, BTN_BACK => 8, BTN_FORWARD => 9, - BTN_LEFT | _ => 1, + BTN_LEFT => 1, + _ => 1, }; xtest::XTestFakeButtonEvent(self.display, x11_button, state as i32, 0); }; diff --git a/src/backend/producer/x11.rs b/src/backend/producer/x11.rs index 7c4e921..d6d7b23 100644 --- a/src/backend/producer/x11.rs +++ b/src/backend/producer/x11.rs @@ -13,7 +13,7 @@ pub struct X11Producer {} impl X11Producer { pub fn new() -> Result { - return Err(anyhow!("not implemented")); + Err(anyhow!("not implemented")) } } diff --git a/src/scancode.rs b/src/scancode.rs index 89ba311..6c868ed 100644 --- a/src/scancode.rs +++ b/src/scancode.rs @@ -419,7 +419,7 @@ pub enum Linux { KeyBrightnessAuto = 244, /* Set Auto Brightness: manual, brightness control is off, rely on ambient */ // KEY_BRIGHTNESS_ZERO=KeyBrightnessAuto, KeyDisplayOff = 245, /* display device to off state */ - KeyWwan = 246, /* Wireless WAN (LTE, UMTS, GSM, etc.) */ + KeyWwan = 246, /* Wireless WAN (LTE, UMTS, GSM, etc.) */ // KEY_WIMAX = KeyWwan, KeyRfkill = 247, /* Key that controls all radios */ KeyMicmute = 248, /* Mute / unmute the microphone */ @@ -528,13 +528,13 @@ impl TryFrom for Windows { Linux::KeyKp0 => Ok(Self::Keypad0Insert), Linux::KeyKpDot => Ok(Self::KeypadDot), Linux::KeyZenkakuhankaku => Ok(Self::KeyLANG1), // TODO unsure - Linux::Key102nd => Ok(Self::KeyNonUSSlashBar), // TODO unsure + Linux::Key102nd => Ok(Self::KeyNonUSSlashBar), // TODO unsure Linux::KeyF11 => Ok(Self::KeyF11), Linux::KeyF12 => Ok(Self::KeyF12), Linux::KeyRo => Ok(Self::ErrorRollOver), // TODO unsure Linux::KeyKatakana => Ok(Self::KeyLANG1), // TODO unsure Linux::KeyHiragana => Ok(Self::KeyLANG2), // TODO unsure - Linux::KeyHenkan => Ok(Self::KeyLANG3), // TODO unsure + Linux::KeyHenkan => Ok(Self::KeyLANG3), // TODO unsure Linux::KeyKatakanahiragana => Ok(Self::KeyLANG4), // TODO unsure Linux::KeyMuhenkan => Ok(Self::KeyLANG4), // TODO unsure Linux::KeyKpJpComma => Ok(Self::KeypadComma), @@ -565,8 +565,8 @@ impl TryFrom for Windows { Linux::KeyScale => Err(()), // TODO Linux::KeyKpcomma => Ok(Self::KeypadComma), Linux::KeyHangeul => Ok(Self::KeyInternational1), // TODO unsure - Linux::KeyHanja => Ok(Self::KeyInternational2), // TODO unsure - Linux::KeyYen => Ok(Self::KeyInternational3), // TODO unsure + Linux::KeyHanja => Ok(Self::KeyInternational2), // TODO unsure + Linux::KeyYen => Ok(Self::KeyInternational3), // TODO unsure Linux::KeyLeftmeta => Ok(Self::KeyLeftGUI), Linux::KeyRightmeta => Ok(Self::KeyRightGUI), Linux::KeyCompose => Ok(Self::KeyApplication), @@ -695,4 +695,4 @@ impl TryFrom for Windows { Linux::Invalid5 => Err(()), } } -} \ No newline at end of file +}