From 19bcf097c1a97dcda9dc76e44a02fdae509cdda6 Mon Sep 17 00:00:00 2001 From: Chen Mulong Date: Tue, 20 May 2025 22:31:18 +0800 Subject: [PATCH] Add rustfmt action --- .github/workflows/rustfmt.yml | 16 ++++++++++++++++ src/clipboard/mac.rs | 2 +- src/clipboard/mime_type.rs | 2 +- src/clipboard/mod.rs | 2 +- src/clipboard/x.rs | 10 +++++----- src/protocol/mod.rs | 4 ++-- src/protocol/recv.rs | 2 +- src/protocol/source_data.rs | 2 +- 8 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/rustfmt.yml diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml new file mode 100644 index 0000000..2050664 --- /dev/null +++ b/.github/workflows/rustfmt.yml @@ -0,0 +1,16 @@ +name: Rustfmt +on: + pull_request: + +jobs: + formatting: + name: cargo fmt + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + # Ensure rustfmt is installed and setup problem matcher + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + components: rustfmt + - name: Rustfmt Check + uses: actions-rust-lang/rustfmt@v1 diff --git a/src/clipboard/mac.rs b/src/clipboard/mac.rs index 2953371..ae18757 100644 --- a/src/clipboard/mac.rs +++ b/src/clipboard/mac.rs @@ -1,7 +1,7 @@ use super::ClipBackend; use super::CopyConfig; use super::PasteConfig; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use cocoa::appkit; use cocoa::appkit::NSPasteboard; diff --git a/src/clipboard/mime_type.rs b/src/clipboard/mime_type.rs index c022d61..3d6b2c8 100644 --- a/src/clipboard/mime_type.rs +++ b/src/clipboard/mime_type.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; const TEXT_TYPE_EXACT: &[&str] = &[ "text/plain;charset=utf-8", diff --git a/src/clipboard/mod.rs b/src/clipboard/mod.rs index de211b0..261a364 100644 --- a/src/clipboard/mod.rs +++ b/src/clipboard/mod.rs @@ -6,9 +6,9 @@ mod wayland; mod x; use super::protocol::SourceData; +use anyhow::Result; #[cfg(target_os = "linux")] use anyhow::bail; -use anyhow::Result; use std::io::Write; pub trait ClipBackend { diff --git a/src/clipboard/x.rs b/src/clipboard/x.rs index 7a907f6..1168099 100644 --- a/src/clipboard/x.rs +++ b/src/clipboard/x.rs @@ -1,21 +1,21 @@ -use super::mime_type::decide_mime_type; use super::ClipBackend; use super::CopyConfig; use super::PasteConfig; +use super::mime_type::decide_mime_type; use crate::protocol::SourceData; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use std::collections::hash_map::HashMap; use std::io::Write; use std::rc::Rc; use x11rb::atom_manager; use x11rb::connection::Connection; use x11rb::connection::RequestConnection; +use x11rb::protocol::Event; use x11rb::protocol::xproto::{ Atom, AtomEnum, ChangeWindowAttributesAux, ConnectionExt, CreateWindowAux, EventMask, PropMode, - Property, SelectionNotifyEvent, SelectionRequestEvent, Window, WindowClass, - SELECTION_NOTIFY_EVENT, + Property, SELECTION_NOTIFY_EVENT, SelectionNotifyEvent, SelectionRequestEvent, Window, + WindowClass, }; -use x11rb::protocol::Event; use x11rb::rust_connection::RustConnection; use x11rb::wrapper::ConnectionExt as WrapperConnectionExt; use x11rb::{COPY_DEPTH_FROM_PARENT, CURRENT_TIME}; diff --git a/src/protocol/mod.rs b/src/protocol/mod.rs index 7642687..2a72c2b 100644 --- a/src/protocol/mod.rs +++ b/src/protocol/mod.rs @@ -1,8 +1,8 @@ mod recv; mod source_data; -pub use recv::receive_data_bulk; -pub use recv::receive_data_oneshot; #[allow(unused_imports)] pub use recv::PROTOCAL_VER; +pub use recv::receive_data_bulk; +pub use recv::receive_data_oneshot; pub use source_data::SourceData; diff --git a/src/protocol/recv.rs b/src/protocol/recv.rs index 07b0439..c5ab6cd 100644 --- a/src/protocol/recv.rs +++ b/src/protocol/recv.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use std::io::Read; pub static PROTOCAL_VER: u8 = 0; diff --git a/src/protocol/source_data.rs b/src/protocol/source_data.rs index 27ac833..d464272 100644 --- a/src/protocol/source_data.rs +++ b/src/protocol/source_data.rs @@ -56,8 +56,8 @@ impl SourceData for Vec { #[cfg(test)] mod tests { use super::*; - use crate::protocol::receive_data_bulk; use crate::protocol::PROTOCAL_VER; + use crate::protocol::receive_data_bulk; #[test] fn test_content_by_mime_type() {