From c15d7ad36a35bce3c631a28856a31a2571237c0c Mon Sep 17 00:00:00 2001
From: NetworkCats <networkcatlol@gmail.com>
Date: Sun, 22 Mar 2026 18:23:22 +0800
Subject: [PATCH] fix: apply rustfmt and replace map_or with is_some_and per
 clippy

---
 src/db.rs           | 2 +-
 src/handlers/api.rs | 2 +-
 src/handlers/mod.rs | 7 ++-----
 src/handlers/seo.rs | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/db.rs b/src/db.rs
index e6526b3..7108c70 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -9,7 +9,7 @@ use maxminddb::Reader;
 use serde::Deserialize;
 
 use crate::models::{
-    from_mmdb_record, IpInfo, MmdbAsn, MmdbCity, MmdbCountry, MmdbProxy, MmdbRecord, ProxyInfo,
+    IpInfo, MmdbAsn, MmdbCity, MmdbCountry, MmdbProxy, MmdbRecord, ProxyInfo, from_mmdb_record,
 };
 
 pub type DbReader = Reader<Vec<u8>>;
diff --git a/src/handlers/api.rs b/src/handlers/api.rs
index 19118d1..c57a58c 100644
--- a/src/handlers/api.rs
+++ b/src/handlers/api.rs
@@ -81,7 +81,7 @@ fn proxy_field_handler(
         return Err(AppError::DbNotReady);
     }
     let ip = resolve_ip(headers, query, state.dev_mode)?;
-    let value = db::lookup_proxy(&state.db, ip).map_or(false, |p| field(&p));
+    let value = db::lookup_proxy(&state.db, ip).is_some_and(|p| field(&p));
     Ok(format!("{value}\n"))
 }
 
diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index d5c8104..b68dee8 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -23,9 +23,7 @@ pub use api::{
     vpn_handler,
 };
 pub use html::{not_found, root, root_redirect, root_trailing_slash};
-pub use seo::{
-    build_openapi_json, favicon, manifest, openapi_json, robots_txt, sitemap_xml,
-};
+pub use seo::{build_openapi_json, favicon, manifest, openapi_json, robots_txt, sitemap_xml};
 
 #[derive(serde::Deserialize)]
 pub struct IpQuery {
@@ -107,8 +105,7 @@ fn handle_non_browser_request(
 
     if wants_json(headers) && query.ip.is_none() {
         return Some(
-            match extract_client_ip(headers, state.dev_mode)
-                .and_then(|ip| lookup_ip(&state.db, ip))
+            match extract_client_ip(headers, state.dev_mode).and_then(|ip| lookup_ip(&state.db, ip))
             {
                 Ok(info) => axum::Json(info).into_response(),
                 Err(e) => e.into_response(),
diff --git a/src/handlers/seo.rs b/src/handlers/seo.rs
index 02b910f..902847a 100644
--- a/src/handlers/seo.rs
+++ b/src/handlers/seo.rs
@@ -17,8 +17,8 @@ pub async fn openapi_json(State(state): State<AppState>) -> Response {
 }
 
 pub fn build_openapi_json(site_domain: &str) -> Arc<str> {
-    let mut spec: serde_json::Value =
-        serde_json::from_str(include_str!("../../openapi.json")).expect("openapi.json must be valid");
+    let mut spec: serde_json::Value = serde_json::from_str(include_str!("../../openapi.json"))
+        .expect("openapi.json must be valid");
 
     let server_url = format!("https://{site_domain}");
     spec["servers"] = serde_json::json!([{ "url": server_url }]);