From bfdbe4ffa05515a2c8e0003f9db564b9d3345c34 Mon Sep 17 00:00:00 2001 From: sxyazi Date: Tue, 9 Apr 2024 01:01:30 +0800 Subject: [PATCH] Format --- yazi-core/src/manager/commands/paste.rs | 2 +- yazi-dds/src/body/body.rs | 4 +--- yazi-dds/src/body/move_.rs | 6 ++---- yazi-dds/src/payload.rs | 16 +++++----------- yazi-dds/src/pubsub.rs | 13 +++---------- 5 files changed, 12 insertions(+), 29 deletions(-) diff --git a/yazi-core/src/manager/commands/paste.rs b/yazi-core/src/manager/commands/paste.rs index 7661bd69..f551f023 100644 --- a/yazi-core/src/manager/commands/paste.rs +++ b/yazi-core/src/manager/commands/paste.rs @@ -3,7 +3,7 @@ use yazi_shared::event::Cmd; use crate::{manager::Manager, tasks::Tasks}; pub struct Opt { - force: bool, + force: bool, follow: bool, } diff --git a/yazi-dds/src/body/body.rs b/yazi-dds/src/body/body.rs index 33cf0f3d..0f17b7c1 100644 --- a/yazi-dds/src/body/body.rs +++ b/yazi-dds/src/body/body.rs @@ -2,9 +2,7 @@ use anyhow::Result; use mlua::{ExternalResult, IntoLua, Lua, Value}; use serde::Serialize; -use super::{ - BodyBulk, BodyCd, BodyCustom, BodyHey, BodyHi, BodyHover, BodyMove, BodyRename, BodyYank, -}; +use super::{BodyBulk, BodyCd, BodyCustom, BodyHey, BodyHi, BodyHover, BodyMove, BodyRename, BodyYank}; use crate::Payload; #[derive(Debug, Serialize)] diff --git a/yazi-dds/src/body/move_.rs b/yazi-dds/src/body/move_.rs index f49ee15d..4a2f42a4 100644 --- a/yazi-dds/src/body/move_.rs +++ b/yazi-dds/src/body/move_.rs @@ -9,7 +9,7 @@ use super::Body; #[derive(Debug, Serialize, Deserialize)] pub struct BodyMove<'a> { pub from: Cow<'a, Url>, - pub to: Cow<'a, Url>, + pub to: Cow<'a, Url>, } impl<'a> BodyMove<'a> { @@ -27,9 +27,7 @@ impl BodyMove<'static> { } impl<'a> From> for Body<'a> { - fn from(value: BodyMove<'a>) -> Self { - Self::Move(value) - } + fn from(value: BodyMove<'a>) -> Self { Self::Move(value) } } impl IntoLua<'_> for BodyMove<'static> { diff --git a/yazi-dds/src/payload.rs b/yazi-dds/src/payload.rs index a9c75515..d7f50327 100644 --- a/yazi-dds/src/payload.rs +++ b/yazi-dds/src/payload.rs @@ -9,18 +9,14 @@ use crate::{body::Body, ID}; #[derive(Debug)] pub struct Payload<'a> { pub receiver: u64, - pub sender: u64, - pub body: Body<'a>, + pub sender: u64, + pub body: Body<'a>, } impl<'a> Payload<'a> { - pub(super) fn new(body: Body<'a>) -> Self { - Self { receiver: 0, sender: *ID, body } - } + pub(super) fn new(body: Body<'a>) -> Self { Self { receiver: 0, sender: *ID, body } } - pub(super) fn flush(&self) { - writeln!(std::io::stdout(), "{self}").ok(); - } + pub(super) fn flush(&self) { writeln!(std::io::stdout(), "{self}").ok(); } pub(super) fn try_flush(&self) { let b = if self.receiver == 0 { @@ -75,9 +71,7 @@ impl FromStr for Payload<'_> { } impl<'a> From> for Payload<'a> { - fn from(value: Body<'a>) -> Self { - Self::new(value) - } + fn from(value: Body<'a>) -> Self { Self::new(value) } } impl Display for Payload<'_> { diff --git a/yazi-dds/src/pubsub.rs b/yazi-dds/src/pubsub.rs index e35598fa..89759dbc 100644 --- a/yazi-dds/src/pubsub.rs +++ b/yazi-dds/src/pubsub.rs @@ -5,10 +5,7 @@ use parking_lot::RwLock; use yazi_boot::BOOT; use yazi_shared::{fs::Url, RoCell}; -use crate::{ - body::{Body, BodyCd, BodyHi, BodyHover, BodyMove, BodyRename, BodyYank}, - Client, ID, PEERS, -}; +use crate::{body::{Body, BodyCd, BodyHi, BodyHover, BodyMove, BodyRename, BodyYank}, Client, ID, PEERS}; pub static LOCAL: RoCell>>>> = RoCell::new(); @@ -62,17 +59,13 @@ impl Pubsub { sub!(REMOTE)(plugin, kind, f) && Self::pub_from_hi() } - pub fn unsub(plugin: &str, kind: &str) -> bool { - unsub!(LOCAL)(plugin, kind) - } + pub fn unsub(plugin: &str, kind: &str) -> bool { unsub!(LOCAL)(plugin, kind) } pub fn unsub_remote(plugin: &str, kind: &str) -> bool { unsub!(REMOTE)(plugin, kind) && Self::pub_from_hi() } - pub fn pub_(body: Body<'static>) { - body.with_receiver(*ID).emit(); - } + pub fn pub_(body: Body<'static>) { body.with_receiver(*ID).emit(); } pub fn pub_to(receiver: u64, body: Body<'static>) { if receiver == *ID {