mirror of
https://github.com/bytedance/g3.git
synced 2026-10-19 17:53:33 +00:00
upgrade dependencies
Some checks failed
CrossCompiling / Build-8 (push) Has been cancelled
CrossCompiling / Build-9 (push) Has been cancelled
CrossCompiling / Build (push) Has been cancelled
CrossCompiling / Build-1 (push) Has been cancelled
CrossCompiling / Build-2 (push) Has been cancelled
CrossCompiling / Build-3 (push) Has been cancelled
CrossCompiling / Build-4 (push) Has been cancelled
CrossCompiling / Build-5 (push) Has been cancelled
CrossCompiling / Build-6 (push) Has been cancelled
CrossCompiling / Build-7 (push) Has been cancelled
Linux-CI / Build vendored-8 (push) Has been cancelled
CodeCoverage / lib unit test (push) Has been cancelled
CodeCoverage / g3mkcert test (push) Has been cancelled
CodeCoverage / g3keymess test (push) Has been cancelled
CodeCoverage / g3proxy test (push) Has been cancelled
CodeCoverage / g3bench test (push) Has been cancelled
CodeCoverage / g3statsd test (push) Has been cancelled
CodeQL Advanced / Analyze (actions) (push) Has been cancelled
CodeQL Advanced / Analyze (java-kotlin) (push) Has been cancelled
CodeQL Advanced / Analyze (python) (push) Has been cancelled
CodeQL Advanced / Analyze (rust) (push) Has been cancelled
Linux-CI / Build (push) Has been cancelled
Linux-CI / Build-1 (push) Has been cancelled
Linux-CI / Build-2 (push) Has been cancelled
Linux-CI / Build-3 (push) Has been cancelled
Linux-CI / Clippy (push) Has been cancelled
Linux-CI / Build vendored (push) Has been cancelled
Linux-CI / Build vendored-1 (push) Has been cancelled
Linux-CI / Build vendored-2 (push) Has been cancelled
Linux-CI / Build vendored-3 (push) Has been cancelled
Linux-CI / Build vendored-4 (push) Has been cancelled
Linux-CI / Build vendored-5 (push) Has been cancelled
Linux-CI / Build vendored-6 (push) Has been cancelled
Linux-CI / Build vendored-7 (push) Has been cancelled
Linux-CI / Build vendored-9 (push) Has been cancelled
Linux-CI / Build vendored-10 (push) Has been cancelled
Linux-CI / Build vendored-11 (push) Has been cancelled
Linux-CI / Build vendored-12 (push) Has been cancelled
Linux-CI / Build vendored-13 (push) Has been cancelled
Linux-CI / Build vendored-14 (push) Has been cancelled
Linux-CI / Build vendored-15 (push) Has been cancelled
Linux-CI / Build vendored-16 (push) Has been cancelled
Linux-CI / Build vendored-17 (push) Has been cancelled
Linux-CI / Build vendored-18 (push) Has been cancelled
Linux-CI / Build vendored-19 (push) Has been cancelled
Linux-CI / Build vendored-20 (push) Has been cancelled
Linux-CI / Build vendored-21 (push) Has been cancelled
Linux-CI / Build vendored-22 (push) Has been cancelled
Linux-CI / Build vendored-23 (push) Has been cancelled
Linux-CI / Build vendored-24 (push) Has been cancelled
Linux-CI / Build vendored-25 (push) Has been cancelled
Linux-CI / Build vendored-26 (push) Has been cancelled
Linux-CI / Build vendored-27 (push) Has been cancelled
Linux-CI / Build vendored-28 (push) Has been cancelled
Linux-CI / Build vendored-29 (push) Has been cancelled
Linux-CI / Build vendored-30 (push) Has been cancelled
Linux-CI / Build with OpenSSL Async Job (push) Has been cancelled
Linux-CI / Build with OpenSSL Async Job-1 (push) Has been cancelled
MacOS-CI / Build (push) Has been cancelled
MacOS-CI / Build vendored (push) Has been cancelled
MacOS-CI / Build vendored-1 (push) Has been cancelled
MacOS-CI / Build vendored-2 (push) Has been cancelled
MacOS-CI / Build vendored-3 (push) Has been cancelled
MacOS-CI / Build vendored-4 (push) Has been cancelled
MacOS-CI / Build vendored-5 (push) Has been cancelled
MacOS-CI / Build vendored-8 (push) Has been cancelled
MacOS-CI / Build vendored-9 (push) Has been cancelled
MacOS-CI / Build vendored-10 (push) Has been cancelled
MacOS-CI / Build vendored-6 (push) Has been cancelled
MacOS-CI / Build vendored-7 (push) Has been cancelled
MacOS-CI / Build vendored-11 (push) Has been cancelled
MacOS-CI / Build vendored-12 (push) Has been cancelled
MacOS-CI / Build vendored-13 (push) Has been cancelled
MacOS-CI / Build vendored-14 (push) Has been cancelled
MacOS-CI / Build vendored-15 (push) Has been cancelled
MacOS-CI / Build vendored-16 (push) Has been cancelled
MacOS-CI / Build vendored-17 (push) Has been cancelled
MacOS-CI / Build vendored-18 (push) Has been cancelled
MacOS-CI / Build vendored-19 (push) Has been cancelled
MacOS-CI / Build vendored-20 (push) Has been cancelled
MacOS-CI / Build vendored-21 (push) Has been cancelled
MacOS-CI / Build vendored-22 (push) Has been cancelled
MacOS-CI / Build vendored-23 (push) Has been cancelled
MacOS-CI / Build vendored-24 (push) Has been cancelled
StaticLinking / musl (push) Has been cancelled
StaticLinking / musl-1 (push) Has been cancelled
StaticLinking / msvc-vcpkg (push) Has been cancelled
StaticLinking / msvc-vendored (push) Has been cancelled
StaticLinking / msvc-vendored-1 (push) Has been cancelled
StaticLinking / msvc-vendored-2 (push) Has been cancelled
StaticLinking / msvc-vendored-3 (push) Has been cancelled
Windows-CI / Build (push) Has been cancelled
Windows-CI / Build vendored (push) Has been cancelled
Windows-CI / Build vendored-1 (push) Has been cancelled
Windows-CI / Build vendored-2 (push) Has been cancelled
Windows-CI / Build vendored-3 (push) Has been cancelled
Windows-CI / Build vendored-4 (push) Has been cancelled
Windows-CI / Build vendored-5 (push) Has been cancelled
Windows-CI / Build vendored-6 (push) Has been cancelled
Windows-CI / Build vendored-7 (push) Has been cancelled
Windows-CI / Build vendored-8 (push) Has been cancelled
Windows-CI / Build vendored-9 (push) Has been cancelled
Windows-CI / Build vendored-10 (push) Has been cancelled
Windows-CI / Build vendored-11 (push) Has been cancelled
Windows-CI / Build vendored-12 (push) Has been cancelled
Windows-CI / Build vendored-13 (push) Has been cancelled
Windows-CI / Build vendored-14 (push) Has been cancelled
Windows-CI / Build vendored-15 (push) Has been cancelled
Windows-CI / Build vendored-16 (push) Has been cancelled
Windows-CI / Build vendored-17 (push) Has been cancelled
Windows-CI / Build vendored-18 (push) Has been cancelled
Windows-CI / Build vendored-19 (push) Has been cancelled
Windows-CI / Build vendored-20 (push) Has been cancelled
Windows-CI / Build vendored-21 (push) Has been cancelled
Windows-CI / Build vendored-22 (push) Has been cancelled
Windows-CI / Build vendored-23 (push) Has been cancelled
Some checks failed
CrossCompiling / Build-8 (push) Has been cancelled
CrossCompiling / Build-9 (push) Has been cancelled
CrossCompiling / Build (push) Has been cancelled
CrossCompiling / Build-1 (push) Has been cancelled
CrossCompiling / Build-2 (push) Has been cancelled
CrossCompiling / Build-3 (push) Has been cancelled
CrossCompiling / Build-4 (push) Has been cancelled
CrossCompiling / Build-5 (push) Has been cancelled
CrossCompiling / Build-6 (push) Has been cancelled
CrossCompiling / Build-7 (push) Has been cancelled
Linux-CI / Build vendored-8 (push) Has been cancelled
CodeCoverage / lib unit test (push) Has been cancelled
CodeCoverage / g3mkcert test (push) Has been cancelled
CodeCoverage / g3keymess test (push) Has been cancelled
CodeCoverage / g3proxy test (push) Has been cancelled
CodeCoverage / g3bench test (push) Has been cancelled
CodeCoverage / g3statsd test (push) Has been cancelled
CodeQL Advanced / Analyze (actions) (push) Has been cancelled
CodeQL Advanced / Analyze (java-kotlin) (push) Has been cancelled
CodeQL Advanced / Analyze (python) (push) Has been cancelled
CodeQL Advanced / Analyze (rust) (push) Has been cancelled
Linux-CI / Build (push) Has been cancelled
Linux-CI / Build-1 (push) Has been cancelled
Linux-CI / Build-2 (push) Has been cancelled
Linux-CI / Build-3 (push) Has been cancelled
Linux-CI / Clippy (push) Has been cancelled
Linux-CI / Build vendored (push) Has been cancelled
Linux-CI / Build vendored-1 (push) Has been cancelled
Linux-CI / Build vendored-2 (push) Has been cancelled
Linux-CI / Build vendored-3 (push) Has been cancelled
Linux-CI / Build vendored-4 (push) Has been cancelled
Linux-CI / Build vendored-5 (push) Has been cancelled
Linux-CI / Build vendored-6 (push) Has been cancelled
Linux-CI / Build vendored-7 (push) Has been cancelled
Linux-CI / Build vendored-9 (push) Has been cancelled
Linux-CI / Build vendored-10 (push) Has been cancelled
Linux-CI / Build vendored-11 (push) Has been cancelled
Linux-CI / Build vendored-12 (push) Has been cancelled
Linux-CI / Build vendored-13 (push) Has been cancelled
Linux-CI / Build vendored-14 (push) Has been cancelled
Linux-CI / Build vendored-15 (push) Has been cancelled
Linux-CI / Build vendored-16 (push) Has been cancelled
Linux-CI / Build vendored-17 (push) Has been cancelled
Linux-CI / Build vendored-18 (push) Has been cancelled
Linux-CI / Build vendored-19 (push) Has been cancelled
Linux-CI / Build vendored-20 (push) Has been cancelled
Linux-CI / Build vendored-21 (push) Has been cancelled
Linux-CI / Build vendored-22 (push) Has been cancelled
Linux-CI / Build vendored-23 (push) Has been cancelled
Linux-CI / Build vendored-24 (push) Has been cancelled
Linux-CI / Build vendored-25 (push) Has been cancelled
Linux-CI / Build vendored-26 (push) Has been cancelled
Linux-CI / Build vendored-27 (push) Has been cancelled
Linux-CI / Build vendored-28 (push) Has been cancelled
Linux-CI / Build vendored-29 (push) Has been cancelled
Linux-CI / Build vendored-30 (push) Has been cancelled
Linux-CI / Build with OpenSSL Async Job (push) Has been cancelled
Linux-CI / Build with OpenSSL Async Job-1 (push) Has been cancelled
MacOS-CI / Build (push) Has been cancelled
MacOS-CI / Build vendored (push) Has been cancelled
MacOS-CI / Build vendored-1 (push) Has been cancelled
MacOS-CI / Build vendored-2 (push) Has been cancelled
MacOS-CI / Build vendored-3 (push) Has been cancelled
MacOS-CI / Build vendored-4 (push) Has been cancelled
MacOS-CI / Build vendored-5 (push) Has been cancelled
MacOS-CI / Build vendored-8 (push) Has been cancelled
MacOS-CI / Build vendored-9 (push) Has been cancelled
MacOS-CI / Build vendored-10 (push) Has been cancelled
MacOS-CI / Build vendored-6 (push) Has been cancelled
MacOS-CI / Build vendored-7 (push) Has been cancelled
MacOS-CI / Build vendored-11 (push) Has been cancelled
MacOS-CI / Build vendored-12 (push) Has been cancelled
MacOS-CI / Build vendored-13 (push) Has been cancelled
MacOS-CI / Build vendored-14 (push) Has been cancelled
MacOS-CI / Build vendored-15 (push) Has been cancelled
MacOS-CI / Build vendored-16 (push) Has been cancelled
MacOS-CI / Build vendored-17 (push) Has been cancelled
MacOS-CI / Build vendored-18 (push) Has been cancelled
MacOS-CI / Build vendored-19 (push) Has been cancelled
MacOS-CI / Build vendored-20 (push) Has been cancelled
MacOS-CI / Build vendored-21 (push) Has been cancelled
MacOS-CI / Build vendored-22 (push) Has been cancelled
MacOS-CI / Build vendored-23 (push) Has been cancelled
MacOS-CI / Build vendored-24 (push) Has been cancelled
StaticLinking / musl (push) Has been cancelled
StaticLinking / musl-1 (push) Has been cancelled
StaticLinking / msvc-vcpkg (push) Has been cancelled
StaticLinking / msvc-vendored (push) Has been cancelled
StaticLinking / msvc-vendored-1 (push) Has been cancelled
StaticLinking / msvc-vendored-2 (push) Has been cancelled
StaticLinking / msvc-vendored-3 (push) Has been cancelled
Windows-CI / Build (push) Has been cancelled
Windows-CI / Build vendored (push) Has been cancelled
Windows-CI / Build vendored-1 (push) Has been cancelled
Windows-CI / Build vendored-2 (push) Has been cancelled
Windows-CI / Build vendored-3 (push) Has been cancelled
Windows-CI / Build vendored-4 (push) Has been cancelled
Windows-CI / Build vendored-5 (push) Has been cancelled
Windows-CI / Build vendored-6 (push) Has been cancelled
Windows-CI / Build vendored-7 (push) Has been cancelled
Windows-CI / Build vendored-8 (push) Has been cancelled
Windows-CI / Build vendored-9 (push) Has been cancelled
Windows-CI / Build vendored-10 (push) Has been cancelled
Windows-CI / Build vendored-11 (push) Has been cancelled
Windows-CI / Build vendored-12 (push) Has been cancelled
Windows-CI / Build vendored-13 (push) Has been cancelled
Windows-CI / Build vendored-14 (push) Has been cancelled
Windows-CI / Build vendored-15 (push) Has been cancelled
Windows-CI / Build vendored-16 (push) Has been cancelled
Windows-CI / Build vendored-17 (push) Has been cancelled
Windows-CI / Build vendored-18 (push) Has been cancelled
Windows-CI / Build vendored-19 (push) Has been cancelled
Windows-CI / Build vendored-20 (push) Has been cancelled
Windows-CI / Build vendored-21 (push) Has been cancelled
Windows-CI / Build vendored-22 (push) Has been cancelled
Windows-CI / Build vendored-23 (push) Has been cancelled
This commit is contained in:
parent
8e9a7b72dc
commit
e28ee3de72
6 changed files with 357 additions and 283 deletions
561
Cargo.lock
generated
561
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
64
Cargo.toml
64
Cargo.toml
|
|
@ -95,33 +95,33 @@ anyhow = "1.0"
|
|||
thiserror = "2.0"
|
||||
itertools = "0.15"
|
||||
rand = { version = "0.10", default-features = false, features = ["thread_rng"] }
|
||||
fastrand = "2.3"
|
||||
fastrand = "2.5"
|
||||
memchr = "2.8"
|
||||
constant_time_eq = "0.4"
|
||||
uuid = "1.23"
|
||||
base64 = "0.22"
|
||||
regex = "1.11"
|
||||
constant_time_eq = "0.6"
|
||||
uuid = "1.26"
|
||||
base64 = "0.23"
|
||||
regex = "1.13"
|
||||
arc-swap = "1.9"
|
||||
chrono = { version = "0.4.45", default-features = false }
|
||||
ascii = "1.0"
|
||||
ascii = "1.1"
|
||||
humanize-rs = "0.1"
|
||||
#
|
||||
portable-atomic = "1.9"
|
||||
portable-atomic = "1.15"
|
||||
itoa = "1.0"
|
||||
atoi = "3.0"
|
||||
atoi = "3.1"
|
||||
zmij = "1.0"
|
||||
num-traits = "0.2"
|
||||
#
|
||||
once_cell = "1.21"
|
||||
bytes = "1.11"
|
||||
smallvec = "1.15"
|
||||
bytes = "1.12"
|
||||
smallvec = "1.16"
|
||||
smol_str = { version = "0.3", default-features = false }
|
||||
arcstr = { version = "1.2", features = ["std"] }
|
||||
foldhash = "0.2"
|
||||
ahash = "0.8"
|
||||
rustc-hash = "2.1"
|
||||
fnv = "1"
|
||||
indexmap = "2.13"
|
||||
indexmap = "2.14"
|
||||
ip_network = "0.4"
|
||||
ip_network_table = "0.2"
|
||||
radix_trie = "0.3"
|
||||
|
|
@ -130,26 +130,26 @@ bitflags = "2.13"
|
|||
lru = { version = "0.18", default-features = false }
|
||||
#
|
||||
blake3 = { version = "1.8", default-features = false }
|
||||
hex = "0.4.2"
|
||||
hex = "0.4.3"
|
||||
hex-literal = "1.1"
|
||||
#
|
||||
idna = "1.0"
|
||||
url = "2.1"
|
||||
idna = "1.1"
|
||||
url = "2.5"
|
||||
mime = "0.3"
|
||||
percent-encoding = "2.1"
|
||||
http = "1.4"
|
||||
percent-encoding = "2.3"
|
||||
http = "1.5"
|
||||
h2 = "0.4"
|
||||
h3-quinn = "0.0.10"
|
||||
h3 = "0.0.8"
|
||||
#
|
||||
log = "0.4"
|
||||
slog = { version = "2.8", features = ["dynamic-keys"] }
|
||||
hdrhistogram = { version = "7.5", default-features = false }
|
||||
hdrhistogram = { version = "7.6", default-features = false }
|
||||
#
|
||||
clap = "4.6.0"
|
||||
clap_complete = "4.6.5"
|
||||
clap = "4.6.7"
|
||||
clap_complete = "4.6.11"
|
||||
#
|
||||
tokio = "1.52.3"
|
||||
tokio = "1.53.1"
|
||||
tokio-util = "0.7"
|
||||
tokio-test = "0.4"
|
||||
futures-util = "0.3"
|
||||
|
|
@ -159,13 +159,13 @@ async-recursion = "1.1"
|
|||
pin-project-lite = "0.2"
|
||||
#
|
||||
rustls-pki-types = { version = "1", default-features = false }
|
||||
rustls = { version = "0.23.40", default-features = false, features = ["std", "tls12", "brotli"] }
|
||||
rustls = { version = "0.23.45", default-features = false, features = ["std", "tls12", "brotli"] }
|
||||
tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] }
|
||||
quinn = { version = "0.11", default-features = false, features = ["runtime-tokio"] }
|
||||
quinn-udp = { version = "0.5.9", default-features = false, features = ["fast-apple-datapath"] }
|
||||
quinn-udp = { version = "0.5.15", default-features = false, features = ["fast-apple-datapath"] }
|
||||
#
|
||||
openssl = { package = "variant-ssl", version = "0.17.11" }
|
||||
openssl-sys = { package = "variant-ssl-sys", version = "0.17.11" }
|
||||
openssl = { package = "variant-ssl", version = "0.17.37" }
|
||||
openssl-sys = { package = "variant-ssl-sys", version = "0.17.37" }
|
||||
openssl-probe = "0.2"
|
||||
#
|
||||
kanal = { version = "0.1.1", default-features = false }
|
||||
|
|
@ -173,15 +173,15 @@ kanal = { version = "0.1.1", default-features = false }
|
|||
c-ares = { version = "12.0", default-features = false }
|
||||
c-ares-resolver = { version = "11.0", default-features = false }
|
||||
c-ares-sys = { version = "11.0", default-features = false }
|
||||
hickory-proto = { version = "0.26.1", default-features = false }
|
||||
hickory-net = { version = "0.26.1", default-features = false }
|
||||
hickory-proto = { version = "0.26.3", default-features = false }
|
||||
hickory-net = { version = "0.26.3", default-features = false }
|
||||
|
||||
#
|
||||
capnp-rpc = "0.26"
|
||||
capnp = "0.26"
|
||||
capnpc = "0.26"
|
||||
capnp-rpc = "0.27"
|
||||
capnp = "0.27"
|
||||
capnpc = "0.27"
|
||||
#
|
||||
libc = "0.2.186"
|
||||
libc = "0.2.189"
|
||||
rustix = { version = "1.1", default-features = false }
|
||||
windows-sys = "0.61"
|
||||
#
|
||||
|
|
@ -190,9 +190,9 @@ yaml-rust = { package = "yaml-rust2", version = "0.11" }
|
|||
serde_json = "1.0"
|
||||
rmp-serde = "1"
|
||||
rmp = "0.8"
|
||||
rmpv = "1.0"
|
||||
rmpv = "1.3"
|
||||
#
|
||||
redis = { version = "1.2", default-features = false }
|
||||
redis = { version = "1.7", default-features = false }
|
||||
#
|
||||
mlua = "0.12.1"
|
||||
pyo3 = { version = "0.29", default-features = false, features = ["auto-initialize"] }
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@ flate2 = { version = "1.1", default-features = false, features = ["zlib-rs"] }
|
|||
g3-geoip-types.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile = "3.0"
|
||||
tempfile = "3.27"
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@ proc-macro = true
|
|||
|
||||
[dependencies]
|
||||
proc-macro2 = "1.0"
|
||||
syn = { version = "2.0", features = ["full"] }
|
||||
syn = { version = "3.0", features = ["full"] }
|
||||
quote = "1.0"
|
||||
|
|
|
|||
|
|
@ -72,12 +72,11 @@ pub(super) fn derive(input: DeriveInput) -> TokenStream {
|
|||
let fn_name = v.name;
|
||||
let expanded = match v.types.pop() {
|
||||
Some(pair) => {
|
||||
let fn_result = pair.into_value();
|
||||
if v.types.is_empty() {
|
||||
if is_async {
|
||||
derive_async_fn_r(&fn_name, fn_result, &arm_attrs, &arm_idents)
|
||||
derive_async_fn_r(&fn_name, pair, &arm_attrs, &arm_idents)
|
||||
} else {
|
||||
derive_fn_r(&fn_name, fn_result, &arm_attrs, &arm_idents)
|
||||
derive_fn_r(&fn_name, pair, &arm_attrs, &arm_idents)
|
||||
}
|
||||
} else {
|
||||
let param_names = (0..v.types.len())
|
||||
|
|
@ -96,7 +95,7 @@ pub(super) fn derive(input: DeriveInput) -> TokenStream {
|
|||
derive_async_fn_p_r(
|
||||
&fn_name,
|
||||
fn_params,
|
||||
fn_result,
|
||||
pair,
|
||||
&arm_attrs,
|
||||
&arm_idents,
|
||||
call_args,
|
||||
|
|
@ -105,7 +104,7 @@ pub(super) fn derive(input: DeriveInput) -> TokenStream {
|
|||
derive_fn_p_r(
|
||||
&fn_name,
|
||||
fn_params,
|
||||
fn_result,
|
||||
pair,
|
||||
&arm_attrs,
|
||||
&arm_idents,
|
||||
call_args,
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ base64 = { workspace = true, optional = true }
|
|||
kanal = { workspace = true, optional = true, features = ["std-mutex"] }
|
||||
slog = { workspace = true, optional = true }
|
||||
indexmap = { workspace = true, optional = true }
|
||||
brotli = { version = "8.0", optional = true, default-features = false, features = ["std"] }
|
||||
brotli = { version = "9.0", optional = true, default-features = false, features = ["std"] }
|
||||
g3-std-ext.workspace = true
|
||||
|
||||
[features]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue