Skip to content

build: upgrade the toolchain, dependencies and every submodule - #55

Merged
acking-you merged 6 commits into
devfrom
chore/upgrade-deps-2026-10
Oct 27, 2026
Merged

acking-you merged 6 commits into
devfrom
chore/upgrade-deps-2026-10

Conversation

@acking-you

@acking-you acking-you commented Oct 27, 2026 •

Copy link
Copy Markdown
Owner

Upgrades the toolchain, crates.io dependencies and every submodule to their latest versions. Every submodule is pinned to the commit merged on its own default branch.

Submodule Merged PRs Pin
deps/tun2proxy acking-you/tun2proxy#14 — upstream v0.8.6, socks5-impl 0.10, netdev 0.47, MSRV 1.95 f51acbd (dev)
deps/ipstack acking-you/ipstack#4 (upstream main) + #5 (review fix: receive window when the buffer is smaller than the MTU) e4ef686 (dev)
deps/kanal acking-you/kanal#1 (upstream main, branches 0.5, lock_api 0.5) + #2 (review fixes: double free / stranded or aborting waiters when a waker panics) + #3 (0.2.2) 2e04519 (dev)
deps/uni-stream acking-you/uni-stream#4 — kanal-plus 0.2.1, parking_lot → std RwLock 0eb13a8 (dev)
deps/rust-smallvec acking-you/rust-smallvec#1 — upstream v2 (2.0.0-beta.3) f7998fd (v2)
deps/better_mimalloc_rs acking-you/better_mimalloc_rs#1 (mimalloc_rust 0.1.52, mimalloc v2.5.2) + #2 (vendored mimalloc acking-you/mimalloc#2: upstream f46cacf6, mi_malloc_size without override) 20f2732 (master)
deps/sysproxy-rs acking-you/sysproxy-rs#1 — macOS fixes on main, interfaces → nix getifaddrs 6cdff0b (main)
ui/flutter Proxy-UI/Proxy-UI-Flutter#39 — Flutter 3.47.8, latest pub deps, tray on tray_manager's native API (5 independent review rounds) 7cd9408 (main)
deps/quinn unchanged: already the latest release (quinn 0.11.12 / quinn-proto 0.11.19) —

kanal-plus 0.2.2 is published on crates.io (0.2.1 carried the two kanal bugs); this repo patches crates.io kanal-plus to the submodule so uni-stream and the workspace share one copy.

Toolchain and CI

  • Rust nightly-2026-01-26 → nightly-2026-10-26 (rust-toolchain.toml, cargo-test.yaml, build-deploy.yaml). Nightly stays because rustfmt.toml uses nightly-only options.
  • docker/login-action v4.7.0; Windows CI fvm 4.1.0 → 4.3.2.
  • dev already carries fix(release): build Android libraries with 16 KB-aligned LOAD segments #56 (NDK r28c + 16 KB alignment release gate); merged into this branch.

crates.io (this repo)

  • sysinfo 0.38 → 0.39, arc-swap 1.9.3, rustls 0.23.46, plist 1.10, lockfile refresh (tokio 1.54.1, ureq 3.5, uuid 1.29, icu 2.4, …).
  • Removed unused dependencies flagged by cargo's new unused_dependencies lint: lru (everywhere), ureq/kanal/async-broadcast from proxy-core; proxy-updater's anyhow is Windows-only.
  • deps/rust-smallvec and deps/better_mimalloc_rs join the workspace exclude list (smallvec is now its own workspace).

Code changes from the upgrades

tun2proxy ArgProxy → ProxyParameters (packet_tunnel binds it first); smallvec smallvec! → new + resize; new nightly lints: fetch_update → try_update, as_chunks (galaxy-geometry, Windows icon), saturating_sub in proxy-tui.

Held back

  • libc =0.2.189 and so parking_lot 0.12: nix 0.31.3 (latest) still fails for iOS with libc ≥ 0.2.190; fix: compatibility with libc 0.2.190 nix-rust/nix#2821 fixes it on master, unreleased.
  • quinn: the commits after quinn-proto-0.11.19 on upstream 0.11.x are an unreleased refactor.
  • Sub-PR holds: Android Gradle/AGP/Kotlin in the UI (no Android SDK to verify), smallvec's bench-only iai-callgrind; three upstream mimalloc v2.5.2 issues on paths our build doesn't reach (answered on build: move to mimalloc v2.5.2 mimalloc#1).

Verified locally (macOS, nightly-2026-10-26, at the final pins)

cargo build --workspace --all-targets --locked (no warnings); CI's clippy (--all-targets --all-features --no-deps --locked -D warnings); cargo fmt --check; cargo test --workspace --locked; cargo check -p proxy-ffi --features network-extension --target aarch64-apple-ios --locked; scripts/release tests; scripts/integration-test.sh (isolated HOME, earlier pins).

Not verified here

Linux/Windows/Android builds of this repo (CI covers Linux/Windows); release (--release) build; the tray's right-click menu in a running app (left click and icon verified on macOS).

🤖 Generated with Claude Code

Toolchain
- nightly-2026-01-26 -> nightly-2026-10-26 (rust-toolchain.toml and both CI
  workflows). rustfmt.toml needs nightly; the newer compiler also unblocks
  sysinfo 0.39 (cfg_select).
- CI: docker/login-action v4.7.0, Windows fvm 4.1.0 -> 4.3.2.

crates.io
- sysinfo 0.38 -> 0.39, arc-swap 1.9.3, rustls 0.23.46, plist 1.10, plus a
  lockfile refresh (tokio 1.54.1, ureq 3.5, uuid 1.29, icu 2.4, ...).
- lru dropped: nothing in the workspace uses it. proxy-core also drops ureq,
  kanal and async-broadcast, which only proxy-client/server use; anyhow is a
  Windows-only dependency of proxy-updater. Cargo's new unused_dependencies
  lint flagged all of these.
- Held: libc =0.2.189 and with it parking_lot 0.12 (0.13 needs libc 0.2.191).
  nix 0.31.3 still fails on iOS against newer libc; the fix (nix#2821) is
  unreleased.
- New lints: AtomicX::fetch_update -> try_update, as_chunks for fixed-size
  chunks, saturating_sub in proxy-tui's Up handling.

Submodules
- tun2proxy: upstream v0.8.6 merged; ArgProxy -> ProxyParameters.
- ipstack: upstream main merged.
- kanal: kanal-plus 0.2.1 (upstream main merged, branches 0.5). The parent
  now uses it as kanal-plus and patches crates.io kanal-plus to the same
  checkout, so uni-stream no longer pulls a second copy whose branches 0.3
  no longer compiles on current nightlies.
- uni-stream: dependencies upgraded, parking_lot replaced by std's RwLock.
- rust-smallvec: upstream v2 (2.0.0-beta.3) merged; smallvec! is deprecated,
  so the header buffer is built with new + resize. It is now its own Cargo
  workspace, so it and better_mimalloc_rs join the exclude list like every
  other fork (both were implicit members until now).
- better_mimalloc_rs: mimalloc_rust 0.1.52 merged, vendored mimalloc v2.5.2.
- sysproxy-rs: macOS fixes landed on a branch, unmaintained interfaces crate
  replaced by nix's getifaddrs.
- ui/flutter: Flutter 3.47.8, latest pub dependencies, tray on
  tray_manager's native API.

quinn stays at quinn-proto 0.11.19 / quinn 0.11.12, its latest release.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 27, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-27T13:52:20.635161Z 82419a1 Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

acking-you and others added 5 commits October 27, 2026 18:32
The new nightly's clippy (chunks_exact_to_as_chunks) rejects constant-size
chunks_exact_mut under -D warnings. This Windows-only call site was not
compiled on the platforms checked locally.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Same shape as tun.rs; the inline form left rustfmt unable to lay out the
map_err closure after the ProxyParameters rename.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- deps/ipstack: acking-you/ipstack#5, receive window opens when the read
  buffer is smaller than the MTU.
- deps/better_mimalloc_rs: acking-you/better_mimalloc_rs#2, vendored
  mimalloc exports mi_malloc_size and mi_malloc_usable_size without the
  override (upstream f46cacf6).
- deps/kanal: acking-you/kanal#2 and #3, kanal-plus 0.2.2 with batch
  receives and sends sound when a waker panics.

Each is the commit merged on the fork's default branch.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Proxy-UI/Proxy-UI-Flutter#39 (merge 7cd9408): Flutter 3.47.8, latest pub
dependencies, and the tray moved to tray_manager's native API with the menu
opened from Dart so it is never replaced or freed while on screen.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@acking-you

Copy link
Copy Markdown
Owner Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Can't wait for the next one!

Reviewed commit: 82419a11b3

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@acking-you
acking-you merged commit a8dfc1c into dev Oct 27, 2026
3 checks passed
@acking-you
acking-you deleted the chore/upgrade-deps-2026-10 branch October 27, 2026 14:15
acking-you added a commit that referenced this pull request Oct 28, 2026
Native 0.6.14 carries the toolchain and dependency upgrade (#55, with the
review fixes in tun2proxy, ipstack, kanal-plus 0.2.2 and mimalloc), Android
libraries with 16 KB-aligned LOAD segments and a release gate for them (#56),
and the QUIC/TCP switching tracking from #54.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant