public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-trycmd] epel10: Allow shlex version 2
@ 2026-09-01 13:18 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-09-01 13:18 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-trycmd
Branch : epel10
Commit : 59574d6446a910da45f30cb572d2ff8bd70f6a46
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-08-31T09:41:55+01:00
Stats  : +61/-0 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-trycmd/c/59574d6446a910da45f30cb572d2ff8bd70f6a46?branch=epel10

Log:
Allow shlex version 2

---
diff --git a/0001-refactor-Resolve-deprecations.patch b/0001-refactor-Resolve-deprecations.patch
new file mode 100644
index 0000000..a988059
--- /dev/null
+++ b/0001-refactor-Resolve-deprecations.patch
@@ -0,0 +1,25 @@
+From 5f82c86150f64acd85288333003e388b0c320645 Mon Sep 17 00:00:00 2001
+From: Ed Page <eopage@gmail.com>
+Date: Mon, 3 Aug 2026 11:59:36 -0500
+Subject: [PATCH] refactor: Resolve deprecations
+
+---
+ src/schema.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/schema.rs b/src/schema.rs
+index e1b9205..14dca62 100644
+--- a/src/schema.rs
++++ b/src/schema.rs
+@@ -713,7 +713,7 @@ impl JoinedArgs {
+ 
+     #[allow(clippy::inherent_to_string_shadow_display)]
+     fn to_string(&self) -> String {
+-        shlex::join(self.inner.iter().map(|s| s.as_str()))
++        shlex::try_join(self.inner.iter().map(|s| s.as_str())).unwrap()
+     }
+ }
+ 
+-- 
+2.55.0
+

diff --git a/rust-trycmd.spec b/rust-trycmd.spec
index cf1f261..3d86464 100644
--- a/rust-trycmd.spec
+++ b/rust-trycmd.spec
@@ -15,6 +15,15 @@ Summary:        Snapshot testing for a herd of CLI tests
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/trycmd
 Source:         %{crates_source}
+# Manually created patch for downstream crate metadata changes
+# * Allow shlex version 2:
+#   https://github.com/assert-rs/snapbox/commit/b5608b41f91021e948f54264ec7ba9f9126ec5fd
+Patch:          trycmd-fix-metadata.diff
+# * refactor: Resolve deprecations
+# * https://github.com/assert-rs/snapbox/commit/5f82c86150f64acd85288333003e388b0c320645
+# * Needed for forward-compatibility with shlex version 2
+# * Exported with git format-patch --relative to apply to the crate
+Patch10:        0001-refactor-Resolve-deprecations.patch
 
 BuildRequires:  cargo-rpm-macros >= 26
 

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 06a61d6..4f1e8c7 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,5 +1,21 @@
 [package]
 cargo-install-bin = false
+cargo-toml-patch-comments = [
+    """\
+Allow shlex version 2: \
+https://github.com/assert-rs/snapbox/commit/b5608b41f91021e948f54264ec7ba9f9126ec5fd\
+""",
+]
+
+[[package.extra-patches]]
+number = 10
+file = "0001-refactor-Resolve-deprecations.patch"
+comments = [
+    "refactor: Resolve deprecations",
+    "https://github.com/assert-rs/snapbox/commit/5f82c86150f64acd85288333003e388b0c320645",
+    "Needed for forward-compatibility with shlex version 2",
+    "Exported with git format-patch --relative to apply to the crate",
+]
 
 [features]
 enable = ["schema"]

diff --git a/trycmd-fix-metadata.diff b/trycmd-fix-metadata.diff
new file mode 100644
index 0000000..4dd7611
--- /dev/null
+++ b/trycmd-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- trycmd-1.2.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ trycmd-1.2.1/Cargo.toml	2026-08-31T08:41:44.195060+00:00
+@@ -150,7 +150,7 @@
+ optional = true
+ 
+ [dependencies.shlex]
+-version = "1.3.0"
++version = ">=1.3.0, <3.0.0"
+ 
+ [dependencies.snapbox]
+ version = "1.2.2"

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-01 13:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-01 13:18 [rpms/rust-trycmd] epel10: Allow shlex version 2 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox