mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-10-23 12:12:09 +08:00
Tunglies
1936f5f97b
Conflict resolution keeps both sides' intent:
- Cargo.toml / src-tauri/Cargo.toml: take dev's dependency updates
(reqwest 0.13.5, open 5.4.4, dirs, windows-sys ToolHelp feature,
clash-verge-logging rename) and drop clash-verge-signal from the
workspace.
- src-tauri/src/lib.rs: drop both resolve::init_signal() (removed by
this PR) and the setup log line (removed on dev).
- src-tauri/src/utils/resolve/mod.rs: keep init_signal() deleted.
- src-tauri/src/utils/server.rs: keep the test module removed on dev
(d87bb7b6); the PR's signal-related test removals are subsumed.
- Cargo.lock: dev's lock minus the clash-verge-signal entries.
Verified with cargo metadata and cargo check -p clash-verge --lib.