Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update diffy requirement from 0.3.0 to 0.4.0 #950

Merged
merged 1 commit into from
Jun 23, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 17, 2024

Updates the requirements on diffy to permit the latest version.

Changelog

Sourced from diffy's changelog.

[0.4.0] - 2024-06-14

Fixed

  • #28 Fixed an issue where conflicts were being omitted from merges.

Added

  • #26 Add ability to reverse a patch.

Changed

  • #29 Bump minimum supported rust version (msrv) to 1.62.1.
  • #22 update nu-ansi-term dependency to 0.50.

[0.3.0] - 2022-08-29

Fixed

  • #17 Fix an issue which resulted in a large slowdown when applying a patch with incorrect hunk headers.
  • #18 Replace unmaintained ansi_term dependency with nu_ansi_term in order to address RUSTSEC-2021-0139.

Changed

  • #19 Bump minimum supported rust version (msrv) to 1.51.0.

[0.2.2] - 2022-01-31

Fixed

  • #16 Fix an issue where patch files failed to parse when they contained hunks which were adjacent to one another.

[0.2.1] - 2021-01-27

Fixed

  • #9 Fix an issue where the incorrect range was being used to index an array when calculating a merge resulting in a panic in some cases.

[0.2.0] - 2020-07-07

Added

  • Support for working with potentially non-utf8 data with the addition of various *_bytes functions.
  • Support for writing both utf8 and non-utf8 patches into a writer W: io::write
  • Support for a minimum supported rust version (msrv) of 1.36.0.

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added the skip-changelog Sometimes changes are not significant enough for a changelog entry label Jun 17, 2024
@korken89
Copy link
Collaborator

@dependabot rebase

Updates the requirements on [diffy](https://github.com/bmwill/diffy) to permit the latest version.
- [Changelog](https://github.com/bmwill/diffy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bmwill/diffy/commits)

---
updated-dependencies:
- dependency-name: diffy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/cargo/diffy-0.4.0 branch from 49b4895 to cfa2448 Compare June 23, 2024 06:14
@korken89 korken89 added this pull request to the merge queue Jun 23, 2024
Merged via the queue into master with commit 9aeae03 Jun 23, 2024
50 checks passed
@dependabot dependabot bot deleted the dependabot/cargo/diffy-0.4.0 branch June 23, 2024 06:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-changelog Sometimes changes are not significant enough for a changelog entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant