vrr/g3
2
0
Fork 0
mirror of https://github.com/bytedance/g3.git synced 2026-05-05 23:41:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

g3-types: bump MSRV to 1.88

Browse source
This commit is contained in:
Zhang Jingqiang 2025-08-09 20:59:14 +08:00
parent aad51f2463
commit ebf2099aad
6 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -1618,7 +1618,7 @@ dependencies = [
[[package]]
name = "g3-types"
version = "0.6.0"
version = "0.7.0"
dependencies = [
"ahash",
"anyhow",

2
Cargo.toml
View file

@ -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" }

3
lib/g3-types/Cargo.toml
View file

@ -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

8
lib/g3-types/src/net/host.rs
View file

@ -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"));
}

20
lib/g3-types/src/stats/tcp.rs
View file

@ -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);
}

40
lib/g3-types/src/stats/udp.rs
View file

@ -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);
}