From 009de543e26f00756bdb141111b367d995d114c9 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 24 Jun 2024 20:02:19 +0200
Subject: [PATCH] Update to version 0.3.1; Fixes RHBZ#2292643

---
 .gitignore                           |  1 +
 cargo-util-schemas-fix-metadata.diff | 15 ++++++++
 port-to-snapbox-0.6.patch            | 51 ++++++++++++++++++++++++++++
 rust-cargo-util-schemas.spec         |  9 ++++-
 sources                              |  2 +-
 5 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 cargo-util-schemas-fix-metadata.diff
 create mode 100644 port-to-snapbox-0.6.patch

diff --git a/.gitignore b/.gitignore
index bd2abc6..6d35eb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /cargo-util-schemas-0.2.0.crate
 /cargo-util-schemas-0.3.0.crate
+/cargo-util-schemas-0.3.1.crate
diff --git a/cargo-util-schemas-fix-metadata.diff b/cargo-util-schemas-fix-metadata.diff
new file mode 100644
index 0000000..7bd002d
--- /dev/null
+++ b/cargo-util-schemas-fix-metadata.diff
@@ -0,0 +1,15 @@
+--- cargo-util-schemas-0.3.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ cargo-util-schemas-0.3.1/Cargo.toml	2024-06-24T17:54:31.454474+00:00
+@@ -46,10 +46,10 @@
+ version = "2.5.0"
+ 
+ [dev-dependencies.snapbox]
+-version = "0.5.9"
++version = "0.6.5"
+ features = [
+     "diff",
+-    "path",
++    "dir",
+     "term-svg",
+ ]
+ 
diff --git a/port-to-snapbox-0.6.patch b/port-to-snapbox-0.6.patch
new file mode 100644
index 0000000..85c442f
--- /dev/null
+++ b/port-to-snapbox-0.6.patch
@@ -0,0 +1,51 @@
+diff --git a/src/core/partial_version.rs b/src/core/partial_version.rs
+index 5057d6046e1..00252f56aa0 100644
+--- a/src/core/partial_version.rs
++++ b/src/core/partial_version.rs
+@@ -186,6 +186,7 @@ enum ErrorKind {
+ #[cfg(test)]
+ mod test {
+     use super::*;
++    use snapbox::prelude::*;
+     use snapbox::str;
+ 
+     #[test]
+@@ -202,7 +203,7 @@ mod test {
+                 Ok(result) => result.to_string(),
+                 Err(err) => format!("didn't pass: {err}"),
+             };
+-            snapbox::assert_eq(expected.clone(), actual);
++            snapbox::assert_data_eq!(actual, expected.clone().raw());
+         }
+     }
+ 
+@@ -241,7 +242,7 @@ mod test {
+                 Ok(result) => format!("didn't fail: {result:?}"),
+                 Err(err) => err.to_string(),
+             };
+-            snapbox::assert_eq(expected.clone(), actual);
++            snapbox::assert_data_eq!(actual, expected.clone().raw());
+         }
+     }
+ }
+diff --git a/src/manifest/rust_version.rs b/src/manifest/rust_version.rs
+index 5c40097737f..7afcf92bd80 100644
+--- a/src/manifest/rust_version.rs
++++ b/src/manifest/rust_version.rs
+@@ -106,6 +106,7 @@ enum RustVersionErrorKind {
+ #[cfg(test)]
+ mod test {
+     use super::*;
++    use snapbox::prelude::*;
+     use snapbox::str;
+ 
+     #[test]
+@@ -212,7 +213,7 @@ mod test {
+                 Ok(result) => format!("didn't fail: {result:?}"),
+                 Err(err) => err.to_string(),
+             };
+-            snapbox::assert_eq(expected.clone(), actual);
++            snapbox::assert_data_eq!(actual, expected.clone().raw());
+         }
+     }
+ }
diff --git a/rust-cargo-util-schemas.spec b/rust-cargo-util-schemas.spec
index abdb08b..90f879a 100644
--- a/rust-cargo-util-schemas.spec
+++ b/rust-cargo-util-schemas.spec
@@ -5,13 +5,20 @@
 %global crate cargo-util-schemas
 
 Name:           rust-cargo-util-schemas
-Version:        0.3.0
+Version:        0.3.1
 Release:        %autorelease
 Summary:        Deserialization schemas for Cargo
 
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/cargo-util-schemas
 Source:         %{crates_source}
+# Manually created patch for downstream crate metadata changes
+# * bump snapbox dev-dependency from 0.5.9 to 0.6.5:
+#   https://github.com/rust-lang/cargo/pull/13963
+Patch:          cargo-util-schemas-fix-metadata.diff
+# * backport upstream port to snapbox 0.6:
+#   https://github.com/rust-lang/cargo/commit/4a6f25c
+Patch:          port-to-snapbox-0.6.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 
diff --git a/sources b/sources
index b440575..5749e7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cargo-util-schemas-0.3.0.crate) = 5ef4687702e7f6d37770bfcd4ddb5b547ef3d4f4eb4713183fe8b74c49651a75d5397d5adda6ed07c6adf2f0cc10117d32a7bdd307a42e9ce6feb6f11a959ad6
+SHA512 (cargo-util-schemas-0.3.1.crate) = cae07c2e13142aa5314461930ec825ee2044b72ea547d1d308a4c67b7ad5c83f016489bd8f9974f09ca39299164f857ad4a1d776de738bb522f3c0c60c5446e1