mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: replace format! with concat! for string literals (#2012)

Browse source 
Co-authored-by: sxyazi <sxyazi@gmail.com>
This commit is contained in:
Integral 2024-12-09 21:19:02 +08:00 • committed by GitHub
parent 62ac224cff
commit a743488476
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
yazi-boot/src/actions/version.rs
View file

@ -1,12 +1,14 @@
use super::Actions; use super::Actions;
impl Actions { impl Actions {
pub(super) fn version() -> String { pub(super) fn version() -> &'static str {
format!( concat!(
"{} ({} {})",
env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_VERSION"),
" (",
env!("VERGEN_GIT_SHA"), env!("VERGEN_GIT_SHA"),
env!("VERGEN_BUILD_DATE") " ",
env!("VERGEN_BUILD_DATE"),
")"
) )
} }
} }

6
yazi-dds/src/body/hey.rs
View file

@ -1,4 +1,4 @@
use std::collections::HashMap; use std::{borrow::Cow, collections::HashMap};
use mlua::{ExternalResult, IntoLua, Lua, Value}; use mlua::{ExternalResult, IntoLua, Lua, Value};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -9,13 +9,13 @@ use crate::Peer;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct BodyHey { pub struct BodyHey {
pub peers: HashMap<u64, Peer>, pub peers: HashMap<u64, Peer>,
pub version: String, pub version: Cow<'static, str>,
} }
impl BodyHey { impl BodyHey {
#[inline] #[inline]
pub fn owned(peers: HashMap<u64, Peer>) -> Body<'static> { pub fn owned(peers: HashMap<u64, Peer>) -> Body<'static> {
Self { peers, version: BodyHi::version() }.into() Self { peers, version: BodyHi::version().into() }.into()
} }
} }

8
yazi-dds/src/body/hi.rs
View file

@ -10,7 +10,7 @@ use super::Body;
pub struct BodyHi<'a> { pub struct BodyHi<'a> {
/// Specifies the kinds of events that the client can handle /// Specifies the kinds of events that the client can handle
pub abilities: HashSet<Cow<'a, str>>, pub abilities: HashSet<Cow<'a, str>>,
pub version: String, pub version: Cow<'static, str>,
} }
impl<'a> BodyHi<'a> { impl<'a> BodyHi<'a> {
@ -18,13 +18,15 @@ impl<'a> BodyHi<'a> {
pub fn borrowed(abilities: HashSet<&'a str>) -> Body<'a> { pub fn borrowed(abilities: HashSet<&'a str>) -> Body<'a> {
Self { Self {
abilities: abilities.into_iter().map(Cow::Borrowed).collect(), abilities: abilities.into_iter().map(Cow::Borrowed).collect(),
version: Self::version(), version: Self::version().into(),
} }
.into() .into()
} }
#[inline] #[inline]
pub fn version() -> String { format!("{} {}", env!("CARGO_PKG_VERSION"), env!("VERGEN_GIT_SHA")) } pub fn version() -> &'static str {
concat!(env!("CARGO_PKG_VERSION"), " ", env!("VERGEN_GIT_SHA"))
}
} }
impl<'a> From<BodyHi<'a>> for Body<'a> { impl<'a> From<BodyHi<'a>> for Body<'a> {

2
yazi-dds/src/client.rs
View file

@ -92,7 +92,7 @@ impl Client {
} }
} }
if version != Some(BodyHi::version()) { if version.as_deref() != Some(BodyHi::version()) {
bail!( bail!(
"Incompatible version (Ya {}, Yazi {})", "Incompatible version (Ya {}, Yazi {})",
BodyHi::version(), BodyHi::version(),