shadow: drop obsolete quinn-udp patch (fixes auto-rebase Cargo.lock conflict) - #1016
Open
ch4r10t33r wants to merge 1 commit into
Open
shadow: drop obsolete quinn-udp patch (fixes auto-rebase Cargo.lock conflict)#1016ch4r10t33r wants to merge 1 commit into
ch4r10t33r wants to merge 1 commit into
Conversation
… shadow-automation) Drops the obsolete vendored quinn-udp fallback (rust/patch/quinn-udp + [patch.crates-io] + rust/Cargo.lock/Cargo.toml edits). zeam's QUIC networking is now pure zig-libp2p (zquic), not rust/quinn, and the Shadow recvmmsg->recvfrom fallback lives in zig-libp2p (>= v0.2.65; main pins v0.2.67) and engages automatically on ENOSYS. The hand-edited rust/Cargo.lock was the recurring shadow-rebase conflict; with the rust patch gone the shadow branch carries only the sim doc and the lean-quickstart shadow-automation tip, so it rebases onto main cleanly. Doc updated to describe the zig-libp2p Shadow path instead of quinn-udp.
Member
|
@ch4r10t33r No need it right now, shadow branch already catchup latest main |
github-actions
Bot
force-pushed
the
shadow
branch
7 times, most recently
from
July 9, 2026 05:00
bfc9dd2 to
2a99970
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What & why
The Shadow Branch Auto-Rebase workflow has been failing on every push to
main(example run) with arust/Cargo.lockconflict while replaying the shadow patch commit onto main.Root cause: the shadow patch carried a vendored
quinn-udpfallback (rust/patch/quinn-udp+[patch.crates-io]+ hand-editedrust/Cargo.lock/Cargo.toml). That patch is now obsolete — zeam's QUIC networking is pure zig-libp2p (zquic), not rust/quinn, and the Shadowrecvmmsg → recvfromfallback lives in zig-libp2p as of v0.2.65 (mainalready pins v0.2.67) and engages automatically onENOSYS. The hand-editedrust/Cargo.lockwas the recurring conflict, and it bought nothing.Change
Rewrites the shadow patch commit to drop all rust/quinn-udp content, keeping only the still-relevant Shadow-only bits:
rust/patch/quinn-udp/*,[patch.crates-io] quinn-udpinrust/Cargo.toml, therust/Cargo.lockeditdocs/shadow-simulation.md(updated to describe the zig-libp2p Shadow path instead of quinn-udp) and thelean-quickstartshadow-automation tipWith the rust patch gone, the shadow branch no longer touches
rust/Cargo.lock, so the auto-rebase applies cleanly going forward.shadowis a single-patch, force-pushed branch (the auto-rebase rewrites it), so this can't land as a normal merge commit — that would keep the old conflicting patch in history. Force-updateshadowto this branch's tip instead:(or I can do it once you've reviewed). This PR is the review artifact for that replacement; the noisy file diff vs
shadowis justmaincatching up — the only substantive change is dropping the rust/quinn-udp patch.