Merge pull request #240 from klensy/prettydiff-bump

bump prettydiff
oli-obk · Jun 21, 2024 · e3f0a72 · e3f0a72
2 parents e336320 + e0c7a52
commit e3f0a72
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 239 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Split up `Revisioned::mode` into `Revisioned::exit_status` and `Revisioned::require_annotations`
 * `Config::output_conflict_handling` is now `Error` instead of `Bless`
+* updated `prettydiff` from 0.6.4 to 0.7.0, which drops `ansi_term` and `winapi*` deps.
 
 ### Removed
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ cargo-platform = "0.1.2"
 comma = "1.0.0"
 anyhow = "1.0.6"
 indicatif = "0.17.6"
-prettydiff = { version = "0.6.4", default_features = false }
+prettydiff = { version = "0.7", default_features = false }
 annotate-snippets = { version = "0.11.2" }
 levenshtein = "1.0.5"
 spanned = "0.2.1"

diff --git a/tests/integrations/basic-fail-mode/Cargo.lock b/tests/integrations/basic-fail-mode/Cargo.lock
diff --git a/tests/integrations/basic-fail/Cargo.lock b/tests/integrations/basic-fail/Cargo.lock
diff --git a/tests/integrations/basic-fail/Cargo.stdout b/tests/integrations/basic-fail/Cargo.stdout
@@ -388,6 +388,8 @@ error: the compiler unexpectedly panicked. this is a bug.
 
 note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md
 
+note: please make sure that you have updated to the latest nightly
+
 
 
 note: compiler flags: -Z treat-err-as-bug

diff --git a/tests/integrations/basic/Cargo.lock b/tests/integrations/basic/Cargo.lock
diff --git a/tests/integrations/cargo-run/Cargo.lock b/tests/integrations/cargo-run/Cargo.lock
diff --git a/tests/integrations/dep-fail/Cargo.lock b/tests/integrations/dep-fail/Cargo.lock
Original file line number	Diff line number	Diff line change
Expand Up		@@ -388,6 +388,8 @@ error: the compiler unexpectedly panicked. this is a bug.

		note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md

		note: please make sure that you have updated to the latest nightly



		note: compiler flags: -Z treat-err-as-bug
Expand Down