diff --git a/Cargo.lock b/Cargo.lock index aae59c13..5e4c4a0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -858,9 +858,9 @@ dependencies = [ [[package]] name = "criterion" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679" +checksum = "e1c047a62b0cc3e145fa84415a3191f628e980b194c2755aa12300a4e6cbd928" dependencies = [ "anes", "cast", @@ -881,12 +881,12 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +checksum = "9b1bcc0dc7dfae599d84ad0b1a55f80cde8af3725da8313b528da95ef783e338" dependencies = [ "cast", - "itertools 0.10.5", + "itertools 0.13.0", ] [[package]] @@ -1493,7 +1493,7 @@ dependencies = [ "idna", "ipnet", "once_cell", - "rand 0.9.1", + "rand 0.9.2", "ring", "serde", "thiserror 2.0.12", @@ -1516,7 +1516,7 @@ dependencies = [ "moka", "once_cell", "parking_lot", - "rand 0.9.1", + "rand 0.9.2", "resolv-conf", "smallvec", "thiserror 2.0.12", @@ -1676,7 +1676,7 @@ dependencies = [ "hyper", "libc", "pin-project-lite", - "socket2", + "socket2 0.5.10", "tokio", "tower-service", "tracing", @@ -1894,6 +1894,17 @@ dependencies = [ "rustversion", ] +[[package]] +name = "io-uring" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +dependencies = [ + "bitflags 2.9.0", + "cfg-if", + "libc", +] + [[package]] name = "ip_network" version = "0.4.1" @@ -1922,7 +1933,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.10", "widestring", "windows-sys 0.48.0", "winreg 0.50.0", @@ -1943,15 +1954,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -2222,10 +2224,10 @@ dependencies = [ "objc", "pretty-hex", "prost 0.14.1", - "rand 0.9.1", + "rand 0.9.2", "security-framework", "smoltcp", - "socket2", + "socket2 0.6.0", "sysinfo", "tempfile", "tokio", @@ -2959,9 +2961,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", @@ -3346,6 +3348,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -3411,9 +3423,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.35.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3ffa3e4ff2b324a57f7aeb3c349656c7b127c3c189520251a648102a92496e" +checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d" dependencies = [ "libc", "memchr", @@ -3576,20 +3588,22 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.1" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "pin-project-lite", "signal-hook-registry", - "socket2", + "slab", + "socket2 0.6.0", "tokio-macros", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3657,7 +3671,7 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.13.5", - "socket2", + "socket2 0.5.10", "tokio", "tokio-stream", "tower 0.4.13", @@ -3775,9 +3789,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.25.6" +version = "0.25.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cf18d43cbf0bfca51f657132cc616a5097edc4424d538bae6fa60142eaf9f0" +checksum = "6d7b8994f367f16e6fa14b5aebbcb350de5d7cbea82dc5b00ae997dd71680dd2" dependencies = [ "cc", "regex", @@ -3799,9 +3813,9 @@ dependencies = [ [[package]] name = "tree-sitter-highlight" -version = "0.25.6" +version = "0.25.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eea684ab5dd71e19f6c0add355be96f2b4eb58327cb305337415208681761aa" +checksum = "7bf7a0dfbd45d88e75c89da0d13fc46f477cc20ce15617b54ebf73978eb66aec" dependencies = [ "regex", "streaming-iterator", diff --git a/Cargo.toml b/Cargo.toml index 5f5a6c9b..86cb141a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,7 +59,7 @@ anyhow = { version = "1.0.97", features = ["backtrace"] } log = "0.4.27" pretty-hex = "0.4.1" smoltcp = "0.12" -tokio = { version = "1.45.1", features = ["macros", "net", "rt-multi-thread", "sync", "time", "io-util", "process"] } +tokio = { version = "1.47.1", features = ["macros", "net", "rt-multi-thread", "sync", "time", "io-util", "process"] } boringtun = { version = "0.6", default-features = false } console-subscriber = { version = "0.4.1", optional = true } image = { version = "0.25.6", default-features = false, features = ["png", "tiff"] } @@ -70,7 +70,7 @@ lru_time_cache = "0.11.11" internet-packet = { version = "0.2.3", features = ["smoltcp"] } data-encoding = "2.8.0" hickory-resolver = "0.25.2" -socket2 = "0.5.10" +socket2 = "0.6.0" [patch.crates-io] # tokio = { path = "../tokio/tokio" } @@ -99,17 +99,17 @@ core-graphics = "0.25" core-foundation = "0.10" cocoa = "0.26" objc = "0.2" -sysinfo = "0.35.2" +sysinfo = "0.36.1" [target.'cfg(target_os = "linux")'.dependencies] tun = { workspace = true, features = ["async"] } tempfile = "3.20.0" -sysinfo = "0.35.2" +sysinfo = "0.36.1" [dev-dependencies] env_logger = "0.11" rand = "0.9" -criterion = "0.6.0" +criterion = "0.7.0" hickory-server = "0.25.2" [[bench]] diff --git a/mitmproxy-contentviews/Cargo.toml b/mitmproxy-contentviews/Cargo.toml index 17983a09..11ce7de8 100644 --- a/mitmproxy-contentviews/Cargo.toml +++ b/mitmproxy-contentviews/Cargo.toml @@ -26,7 +26,7 @@ flate2 = "1.1" protobuf-parse = "3.7" [dev-dependencies] -criterion = "0.6.0" +criterion = "0.7.0" [[bench]] name = "contentviews" diff --git a/mitmproxy-highlight/Cargo.toml b/mitmproxy-highlight/Cargo.toml index ecd3cb04..68c99471 100644 --- a/mitmproxy-highlight/Cargo.toml +++ b/mitmproxy-highlight/Cargo.toml @@ -13,15 +13,15 @@ workspace = true [dependencies] anyhow = { version = "1.0.97", features = ["backtrace"] } -tree-sitter = "0.25.6" +tree-sitter = "0.25.8" tree-sitter-css = "0.23.2" -tree-sitter-highlight = "0.25.6" +tree-sitter-highlight = "0.25.8" tree-sitter-javascript = "0.23.1" tree-sitter-xml = "0.7.0" tree-sitter-yaml = "0.7.1" [dev-dependencies] -criterion = "0.6.0" +criterion = "0.7.0" [[bench]] name = "syntax_highlight" diff --git a/mitmproxy-linux/Cargo.toml b/mitmproxy-linux/Cargo.toml index 06a7602b..febfeab7 100644 --- a/mitmproxy-linux/Cargo.toml +++ b/mitmproxy-linux/Cargo.toml @@ -21,7 +21,7 @@ mitmproxy-linux-ebpf-common = { path = "../mitmproxy-linux-ebpf-common"} tun = { workspace = true, features = ["async"] } aya = { workspace = true } aya-log = { workspace = true } -tokio = { version = "1.45", features = ["macros", "net", "rt-multi-thread", "sync", "io-util", "signal"] } +tokio = { version = "1.47", features = ["macros", "net", "rt-multi-thread", "sync", "io-util", "signal"] } anyhow = { version = "1.0.97", features = ["backtrace"] } log = "0.4.27" env_logger = "0.11.5" diff --git a/mitmproxy-rs/Cargo.toml b/mitmproxy-rs/Cargo.toml index e9b82b60..5f1fe903 100644 --- a/mitmproxy-rs/Cargo.toml +++ b/mitmproxy-rs/Cargo.toml @@ -26,7 +26,7 @@ pyo3 = { version = "0.25", features = ["abi3", "abi3-py312", "anyhow"] } pyo3-async-runtimes = { version = "0.25", features = ["tokio-runtime", "testing", "attributes"] } pyo3-log = "0.12" rand_core = { version = "0.6.4", features = ["getrandom"] } # https://github.com/dalek-cryptography/curve25519-dalek/issues/731 -tokio = { version = "1.45", features = ["macros", "net", "rt-multi-thread", "sync"] } +tokio = { version = "1.47", features = ["macros", "net", "rt-multi-thread", "sync"] } boringtun = "0.6" tar = "0.4.44" console-subscriber = { version = "0.4.1", optional = true } diff --git a/mitmproxy-windows/redirector/Cargo.toml b/mitmproxy-windows/redirector/Cargo.toml index dd8a0675..c84940d2 100644 --- a/mitmproxy-windows/redirector/Cargo.toml +++ b/mitmproxy-windows/redirector/Cargo.toml @@ -15,7 +15,7 @@ workspace = true [target.'cfg(windows)'.dependencies] mitmproxy = { path = "../../" } -tokio = { version = "1.45", features = ["macros", "net", "rt-multi-thread", "sync", "io-util"] } +tokio = { version = "1.47", features = ["macros", "net", "rt-multi-thread", "sync", "io-util"] } anyhow = { version = "1.0.97", features = ["backtrace"] } windivert = "0.6.0" lru_time_cache = "0.11.11"