Replace patch with gitpatch

[psandana]

patch crate is unmaintained: uniphil/patch-rs#29

Project has been forked, and a new version with fixes has been created: https://github.com/gitpatch-rs/gitpatch

gitpatch version 0.7.1 is a direct replacement of patch version 0.7.0. Thus, no major changes are required.

[sourcefrog]

Thanks, Also, I think I added a workaround for the "binary files differ" failure, which should be removed as it will no longer be necessary. Martin

…

On Tue, Apr 15, 2025 at 1:34 PM Pato Sandaña ***@***.***> wrote: patch crate is unmaintained: uniphil/patch-rs#29 <uniphil/patch-rs#29> Project has been forked, and a new version with fixes has been created: https://github.com/gitpatch-rs/gitpatch gitpatch version 0.7.1 is a direct replacement of patch version 0.7.0. Thus, no major changes are required. ------------------------------ You can view, comment on, or merge this pull request online at: #507 Commit Summary - b18e715 <b18e715> Replace patch with gitpatch File Changes (3 files <https://github.com/sourcefrog/cargo-mutants/pull/507/files>) - *M* Cargo.lock <https://github.com/sourcefrog/cargo-mutants/pull/507/files#diff-13ee4b2252c9e516a0547f2891aa2105c3ca71c6d7a1e682c69be97998dfc87e> (24) - *M* Cargo.toml <https://github.com/sourcefrog/cargo-mutants/pull/507/files#diff-2e9d962a08321605940b5a657135052fbcef87b5e360662bb527c96d9a615542> (2) - *M* src/in_diff.rs <https://github.com/sourcefrog/cargo-mutants/pull/507/files#diff-6825bf9ffd72cc9c5aac0b965a5bd1cfa0b080c6a9137ccbe8fe07d99603eb4f> (2) Patch Links: - https://github.com/sourcefrog/cargo-mutants/pull/507.patch - https://github.com/sourcefrog/cargo-mutants/pull/507.diff — Reply to this email directly, view it on GitHub <#507>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AACUR4ZDAVTPBDH72NWBEMT2ZVUNHAVCNFSM6AAAAAB3GSPOXCVHI2DSMVQWIX3LMV43ASLTON2WKOZSHE4TONJUHAZDGOI> . You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>

[psandana]

Thanks, Also, I think I added a workaround for the "binary files differ" failure, which should be removed as it will no longer be necessary. Martin

There are more issues than the first one. Like this one: uniphil/patch-rs#24.

[sourcefrog]

Yes, I'm in favor of updating to a maintained fork, I'm just adding a note (maybe for myself) to remove the obsolete workaround.

…

Message ID: ***@***.***>

[sourcefrog]

Specifically 78b7e31 could be partially reverted, leaving the test in place, and the changelog entry.

[psandana]

@sourcefrog maybe I misunderstood. Do you want me to do these changes on this PR?

Specifically 78b7e31 could be partially reverted, leaving the test in place, and the changelog entry.

[sourcefrog]

If you can do it that would be great

[psandana]

@sourcefrog I partially reverted 78b7e31. Is anything left? :)

[sourcefrog]

Thanks, removal of the workaround looks good.

Let's wait and see about patch vs gitpatch in uniphil/patch-rs#29 (comment). No need to bifurcate if upstream is actually still maintained.

[sourcefrog]

I just looked at this again in the context of fixing #547, where I hit gitpatch-rs/gitpatch#4.

At the moment it's unclear to me whether patch-rs or gitpatch is going to be better maintained. There is a PR gitpatch-rs/gitpatch#5 to fix that bug but it's been open for a few months. Both libraries have issues open asking about maintenance.

[sourcefrog]

I'm carrying this forward in #575 but it needs some more fixes merged to gitpatch and a new release before there's a net improvement from landing it.