From ebf2099aadbaaa169bc28788af08c63c5504ce46 Mon Sep 17 00:00:00 2001
From: Zhang Jingqiang <zh_jq@outlook.com>
Date: Sat, 9 Aug 2025 20:59:14 +0800
Subject: [PATCH] g3-types: bump MSRV to 1.88

---
 Cargo.lock                    |  2 +-
 Cargo.toml                    |  2 +-
 lib/g3-types/Cargo.toml       |  3 ++-
 lib/g3-types/src/net/host.rs  |  8 +++----
 lib/g3-types/src/stats/tcp.rs | 20 +++++++++---------
 lib/g3-types/src/stats/udp.rs | 40 +++++++++++++++++------------------
 6 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d72afc6..3258fe51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1618,7 +1618,7 @@ dependencies = [
 
 [[package]]
 name = "g3-types"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "ahash",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index a6ff3db4..4ef202d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -235,7 +235,7 @@ g3-stdlog = { version = "0.3", path = "lib/g3-stdlog" }
 g3-syslog = { version = "0.8", path = "lib/g3-syslog" }
 g3-tls-cert = { version = "0.7", path = "lib/g3-tls-cert" }
 g3-tls-ticket = { version = "0.3", path = "lib/g3-tls-ticket" }
-g3-types = { version = "0.6", path = "lib/g3-types" }
+g3-types = { version = "0.7", path = "lib/g3-types" }
 g3-udpdump = { version = "0.2", path = "lib/g3-udpdump" }
 g3-xcrypt = { version = "0.3", path = "lib/g3-xcrypt" }
 g3-yaml = { version = "0.6", path = "lib/g3-yaml" }
diff --git a/lib/g3-types/Cargo.toml b/lib/g3-types/Cargo.toml
index 9f9944c1..428295be 100644
--- a/lib/g3-types/Cargo.toml
+++ b/lib/g3-types/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "g3-types"
-version = "0.6.0"
+version = "0.7.0"
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/lib/g3-types/src/net/host.rs b/lib/g3-types/src/net/host.rs
index 59ccba13..7529aef3 100644
--- a/lib/g3-types/src/net/host.rs
+++ b/lib/g3-types/src/net/host.rs
@@ -112,10 +112,10 @@ impl FromStr for Host {
         match s.as_bytes()[0] {
             b'[' => {
                 let pos_last = s.len() - 1;
-                if s.as_bytes()[pos_last] == b']' {
-                    if let Ok(ip6) = Ipv6Addr::from_str(&s[1..pos_last]) {
-                        return Ok(Host::from_maybe_mapped_ip6(ip6));
-                    }
+                if s.as_bytes()[pos_last] == b']'
+                    && let Ok(ip6) = Ipv6Addr::from_str(&s[1..pos_last])
+                {
+                    return Ok(Host::from_maybe_mapped_ip6(ip6));
                 }
                 return Err(anyhow!("invalid ipv6 ip in squared brackets"));
             }
diff --git a/lib/g3-types/src/stats/tcp.rs b/lib/g3-types/src/stats/tcp.rs
index 87660775..7a4525cc 100644
--- a/lib/g3-types/src/stats/tcp.rs
+++ b/lib/g3-types/src/stats/tcp.rs
@@ -90,11 +90,11 @@ impl ThreadedTcpIoStats {
     }
 
     pub fn add_in_bytes(&self, tid: Option<usize>, size: u64) {
-        if let Some(tid) = tid {
-            if let Some(s) = self.p.get(tid) {
-                s.add_in_bytes(size);
-                return;
-            }
+        if let Some(tid) = tid
+            && let Some(s) = self.p.get(tid)
+        {
+            s.add_in_bytes(size);
+            return;
         }
         self.a.add_in_bytes(size);
     }
@@ -107,11 +107,11 @@ impl ThreadedTcpIoStats {
     }
 
     pub fn add_out_bytes(&self, tid: Option<usize>, size: u64) {
-        if let Some(tid) = tid {
-            if let Some(s) = self.p.get(tid) {
-                s.add_out_bytes(size);
-                return;
-            }
+        if let Some(tid) = tid
+            && let Some(s) = self.p.get(tid)
+        {
+            s.add_out_bytes(size);
+            return;
         }
         self.a.add_out_bytes(size);
     }
diff --git a/lib/g3-types/src/stats/udp.rs b/lib/g3-types/src/stats/udp.rs
index e6bdfc30..499732cd 100644
--- a/lib/g3-types/src/stats/udp.rs
+++ b/lib/g3-types/src/stats/udp.rs
@@ -118,41 +118,41 @@ impl ThreadedUdpIoStats {
     }
 
     pub fn add_in_packet(&self, tid: Option<usize>) {
-        if let Some(tid) = tid {
-            if let Some(s) = self.p.get(tid) {
-                s.add_in_packet();
-                return;
-            }
+        if let Some(tid) = tid
+            && let Some(s) = self.p.get(tid)
+        {
+            s.add_in_packet();
+            return;
         }
         self.a.add_in_packet();
     }
 
     pub fn add_in_bytes(&self, tid: Option<usize>, size: u64) {
-        if let Some(tid) = tid {
-            if let Some(s) = self.p.get(tid) {
-                s.add_in_bytes(size);
-                return;
-            }
+        if let Some(tid) = tid
+            && let Some(s) = self.p.get(tid)
+        {
+            s.add_in_bytes(size);
+            return;
         }
         self.a.add_in_bytes(size);
     }
 
     pub fn add_out_packet(&self, tid: Option<usize>) {
-        if let Some(tid) = tid {
-            if let Some(s) = self.p.get(tid) {
-                s.add_out_packet();
-                return;
-            }
+        if let Some(tid) = tid
+            && let Some(s) = self.p.get(tid)
+        {
+            s.add_out_packet();
+            return;
         }
         self.a.add_out_packet();
     }
 
     pub fn add_out_bytes(&self, tid: Option<usize>, size: u64) {
-        if let Some(tid) = tid {
-            if let Some(s) = self.p.get(tid) {
-                s.add_out_bytes(size);
-                return;
-            }
+        if let Some(tid) = tid
+            && let Some(s) = self.p.get(tid)
+        {
+            s.add_out_bytes(size);
+            return;
         }
         self.a.add_out_bytes(size);
     }