refactor(tuic): use tuic-core re-exported quinn#1429
Conversation
- Switch tuic-core dep from tag v1.8.1 to build/tuic branch - Remove tuic-quinn (direct quinn dep) in favor of tuic-core re-exports - Replace tuic_quinn:: with tuic_core::quinn:: - Fix tuic_core::quinn::quinn:: nested path → tuic_core::quinn:: Assisted-by: OpenClaw:deepseek-v4-flash
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (5)
📝 WalkthroughWalkthroughConsolidates TUIC dependencies by removing ChangesTUIC Dependency Consolidation
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@clash-lib/Cargo.toml`:
- Line 187: Replace the branch pin for the tuic-core dependency in Cargo.toml
with an explicit rev to make the commit visible in the manifest: update the
dependency entry for "tuic-core" (currently using branch = "build/tuic") to use
rev = "562ea5706d28529e8db74128bb4a23edfe9c0ffa" instead of branch, keeping the
same git URL, optional = true and features list so the exact commit is
documented in Cargo.toml.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: ASSERTIVE
Plan: Pro Plus
Run ID: e2d40050-b6c9-4eb9-89dd-9cf0ea931f51
⛔ Files ignored due to path filters (1)
Cargo.lockis excluded by!**/*.lock
📒 Files selected for processing (6)
clash-lib/Cargo.tomlclash-lib/src/proxy/converters/tuic.rsclash-lib/src/proxy/tuic/handle_stream.rsclash-lib/src/proxy/tuic/handle_task.rsclash-lib/src/proxy/tuic/mod.rsclash-lib/src/proxy/tuic/types.rs
|
|
||
| # tuic | ||
| tuic-core= { tag = "v1.8.1", optional = true, git = "https://github.com/Itsusinn/tuic.git", features = ["async_marshal", "marshal", "model"] } | ||
| tuic-core= { branch = "build/tuic", optional = true, git = "https://github.com/Itsusinn/tuic.git", features = ["async_marshal", "marshal", "model"] } |
There was a problem hiding this comment.
🧹 Nitpick | 🔵 Trivial | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "Remote build/tuic head:"
git ls-remote https://github.com/Itsusinn/tuic.git refs/heads/build/tuic
echo
echo "Pinned tuic-core entry in Cargo.lock (if present):"
if [ -f Cargo.lock ]; then
rg -n -C3 'name = "tuic-core"|git\+https://github.com/Itsusinn/tuic\.git' Cargo.lock
else
echo "Cargo.lock not found in this checkout."
fiRepository: Watfaq/clash-rs
Length of output: 453
🏁 Script executed:
#!/bin/bash
# Check if Cargo.lock exists in repo and is tracked
if git ls-files Cargo.lock | grep -q Cargo.lock; then
echo "Cargo.lock is tracked in git"
git log --oneline -1 -- Cargo.lock 2>/dev/null | head -1 || echo "Cargo.lock exists"
else
echo "Cargo.lock is NOT tracked in git"
fi
# Confirm the dependency source in Cargo.toml matches what we saw
rg -n 'tuic-core' clash-lib/Cargo.toml | head -5Repository: Watfaq/clash-rs
Length of output: 348
Consider pinning tuic-core to an explicit rev for clarity.
The current branch = "build/tuic" reference is already locked via Cargo.lock to commit 562ea5706d28529e8db74128bb4a23edfe9c0ffa, ensuring deterministic builds. Switching to an explicit rev would make the pinned commit visible in Cargo.toml itself, improving code readability and reproducibility clarity.
Suggested change
-tuic-core= { branch = "build/tuic", optional = true, git = "https://github.com/Itsusinn/tuic.git", features = ["async_marshal", "marshal", "model"] }
+tuic-core = { rev = "562ea5706d28529e8db74128bb4a23edfe9c0ffa", optional = true, git = "https://github.com/Itsusinn/tuic.git", features = ["async_marshal", "marshal", "model"] }📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| tuic-core= { branch = "build/tuic", optional = true, git = "https://github.com/Itsusinn/tuic.git", features = ["async_marshal", "marshal", "model"] } | |
| tuic-core = { rev = "562ea5706d28529e8db74128bb4a23edfe9c0ffa", optional = true, git = "https://github.com/Itsusinn/tuic.git", features = ["async_marshal", "marshal", "model"] } |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@clash-lib/Cargo.toml` at line 187, Replace the branch pin for the tuic-core
dependency in Cargo.toml with an explicit rev to make the commit visible in the
manifest: update the dependency entry for "tuic-core" (currently using branch =
"build/tuic") to use rev = "562ea5706d28529e8db74128bb4a23edfe9c0ffa" instead of
branch, keeping the same git URL, optional = true and features list so the exact
commit is documented in Cargo.toml.
Assisted-by: OpenClaw:deepseek-v4-flash
|
@copilot resolve the merge conflicts in this pull request |
Co-authored-by: ibigbug <543405+ibigbug@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Watfaq/clash-rs/sessions/9d1912b7-4322-4f5c-ac39-9d2e4908d2af Co-authored-by: ibigbug <543405+ibigbug@users.noreply.github.com>
Conflicts are resolved and the branch is updated with master in commit |
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
📊 Proxy Throughput ResultsShadowsocks
Trojan
VMess
VLESS
SOCKS5
AnyTLS
Hysteria2
TUIC
ShadowQUIC
SSH
Netem Tests (50 ms delay, 1% packet loss)Shadowsocks
Trojan
Hysteria2
TUIC
ShadowQUIC
Ran 34 variant(s) in parallel; each direction transfers the full payload. 🖥️ Test Environment
📎 View full workflow run and download artifacts Full test logDownload the |
Switch tuic-core dep from tag v1.8.1 to
build/tuicbranch which re-exports quinn internally.Changes:
tuic-quinndirect quinn dependencytuic_quinn::imports withtuic_core::quinn::tuic_core::quinn::quinn::paths →tuic_core::quinn::Assisted-by: OpenClaw:deepseek-v4-flash
Summary by CodeRabbit