From b111e6395333c2acaa22b4013bbb41f3b9b72ceb Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 6 Jun 2024 17:10:35 +0900
Subject: [PATCH] chore (backend-rs): prefer unwrap_or_else
---
packages/backend-rs/src/config/server.rs | 2 +-
packages/backend-rs/src/federation/nodeinfo/generate.rs | 4 ++--
packages/backend-rs/src/init/system_info.rs | 8 ++++----
packages/backend-rs/src/service/antenna/check_hit.rs | 2 +-
packages/backend-rs/src/service/stream.rs | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/packages/backend-rs/src/config/server.rs b/packages/backend-rs/src/config/server.rs
index e8a7cf73ab..41ada46a4e 100644
--- a/packages/backend-rs/src/config/server.rs
+++ b/packages/backend-rs/src/config/server.rs
@@ -293,7 +293,7 @@ pub fn load_config() -> Config {
} else {
server_config.redis.prefix.clone()
}
- .unwrap_or(hostname.clone());
+ .unwrap_or_else(|| hostname.clone());
Config {
url: server_config.url,
diff --git a/packages/backend-rs/src/federation/nodeinfo/generate.rs b/packages/backend-rs/src/federation/nodeinfo/generate.rs
index 49c3f8f63f..cc2add0fc4 100644
--- a/packages/backend-rs/src/federation/nodeinfo/generate.rs
+++ b/packages/backend-rs/src/federation/nodeinfo/generate.rs
@@ -66,7 +66,7 @@ async fn generate_nodeinfo_2_1() -> Result<Nodeinfo21, Error> {
let metadata = HashMap::from([
(
"nodeName".to_string(),
- json!(meta.name.unwrap_or(CONFIG.host.clone())),
+ json!(meta.name.unwrap_or_else(|| CONFIG.host.clone())),
),
("nodeDescription".to_string(), json!(meta.description)),
("repositoryUrl".to_string(), json!(meta.repository_url)),
@@ -93,7 +93,7 @@ async fn generate_nodeinfo_2_1() -> Result<Nodeinfo21, Error> {
("proxyAccountName".to_string(), json!(meta.proxy_account_id)),
(
"themeColor".to_string(),
- json!(meta.theme_color.unwrap_or("#31748f".to_string())),
+ json!(meta.theme_color.unwrap_or_else(|| "#31748f".to_string())),
),
]);
diff --git a/packages/backend-rs/src/init/system_info.rs b/packages/backend-rs/src/init/system_info.rs
index 138e7486e0..c4847cdd0d 100644
--- a/packages/backend-rs/src/init/system_info.rs
+++ b/packages/backend-rs/src/init/system_info.rs
@@ -26,19 +26,19 @@ pub fn show_server_info() -> Result<(), SysinfoPoisonError> {
tracing::info!(
"Hostname: {}",
- System::host_name().unwrap_or("unknown".to_string())
+ System::host_name().unwrap_or_else(|| "unknown".to_string())
);
tracing::info!(
"OS: {}",
- System::long_os_version().unwrap_or("unknown".to_string())
+ System::long_os_version().unwrap_or_else(|| "unknown".to_string())
);
tracing::info!(
"Kernel: {}",
- System::kernel_version().unwrap_or("unknown".to_string())
+ System::kernel_version().unwrap_or_else(|| "unknown".to_string())
);
tracing::info!(
"CPU architecture: {}",
- System::cpu_arch().unwrap_or("unknown".to_string())
+ System::cpu_arch().unwrap_or_else(|| "unknown".to_string())
);
tracing::info!("CPU threads: {}", system_info.cpus().len());
tracing::info!("Total memory: {} MiB", system_info.total_memory() / 1048576);
diff --git a/packages/backend-rs/src/service/antenna/check_hit.rs b/packages/backend-rs/src/service/antenna/check_hit.rs
index 8a0bec6e0a..cf4429212c 100644
--- a/packages/backend-rs/src/service/antenna/check_hit.rs
+++ b/packages/backend-rs/src/service/antenna/check_hit.rs
@@ -61,7 +61,7 @@ pub async fn check_hit_antenna(
== note_author
.host
.clone()
- .unwrap_or(CONFIG.host.clone())
+ .unwrap_or_else(|| CONFIG.host.clone())
.to_ascii_lowercase()
});
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index dc73499968..b87ded9261 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -66,7 +66,7 @@ pub async fn publish_to_stream(
format!(
"{{\"type\":\"{}\",\"body\":{}}}",
kind,
- value.unwrap_or("null".to_string()),
+ value.unwrap_or_else(|| "null".to_string()),
)
} else {
value.ok_or(Error::Value("Invalid streaming message".to_string()))?