catch-up: sync 0.1.1 -> 0.1.4 from Forgejo, keep GitHub git deps - #3
Merged
Merged
Conversation
AusAgentSmith
approved these changes
Jul 24, 2026
AusAgentSmith
left a comment
AusAgentSmith
left a comment
Contributor
There was a problem hiding this comment.
Reviewed: catches GitHub main up from 0.1.1 to Forgejo's 0.1.4, resolving conflicts to keep GitHub git-source deps while taking Forgejo's real feature/fix commits. CI green.
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
2 participants
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.
GitHub main was stuck at 0.1.1 while Forgejo main (the ongoing development source) had progressed to 0.1.4 with real changes (BEP-44 crypto/mutable-item-store tests, a rand 0.10 API fix, dependency version bumps). Rebases those Forgejo-exclusive commits onto GitHub main, resolving conflicts by keeping the GitHub git-source deps (not reverting to the Forgejo registry) while taking the version/content bumps. Also fixes the same unused-import warning from a prior clippy-conflict resolution. Verified with cargo check --all-targets, cargo fmt --check, and cargo clippy --all-targets -- -D warnings, all clean.