From 02cabfeb1ae45fc40fd8a041d0030ae7812dd4df Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Sat, 26 Jul 2025 10:03:02 -0500 Subject: [PATCH] Drop entirety of old patch set Both the Rust edition and the lifetime thing were changed in Rust 1.85, which is now available in Debian 13. These patches are no longer necessary. --- .../0001-Rust-edition-downgrade-to-2021.patch | 23 ----------- ...empty-body-string-outside-the-let-if.patch | 39 ------------------- debian/patches/series | 2 - 3 files changed, 64 deletions(-) delete mode 100644 debian/patches/0001-Rust-edition-downgrade-to-2021.patch delete mode 100644 debian/patches/0002-Lift-the-empty-body-string-outside-the-let-if.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/0001-Rust-edition-downgrade-to-2021.patch b/debian/patches/0001-Rust-edition-downgrade-to-2021.patch deleted file mode 100644 index d2cb08b..0000000 --- a/debian/patches/0001-Rust-edition-downgrade-to-2021.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Robert Garrett -Date: Sun, 1 Jun 2025 17:59:20 -0500 -Subject: Rust edition downgrade to 2021 - -Debian Bookworm uses Rust 1.63 which only supports up to the 2021 -edition. ---- - Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 39341a1..4ec2031 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -1,7 +1,7 @@ - [package] - name = "gt-tool" - version = "3.0.0" --edition = "2024" -+edition = "2021" - - [dependencies] - clap = { version = "4.0.7", features = ["derive", "env"] } diff --git a/debian/patches/0002-Lift-the-empty-body-string-outside-the-let-if.patch b/debian/patches/0002-Lift-the-empty-body-string-outside-the-let-if.patch deleted file mode 100644 index 2622584..0000000 --- a/debian/patches/0002-Lift-the-empty-body-string-outside-the-let-if.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Robert Garrett -Date: Fri, 4 Jul 2025 09:36:52 -0500 -Subject: Lift the empty-body string outside the let-if - -The if-else block that selects between the body of the Release or a -placeholder is returning references to variables that only exist -*inside* the body of the if-else blocks. Newer Rust versions seem to -understand the intent and do The Right Thing anyway (or they have some -other rule for how if-else block scopes work). - -Manually lifting the variable to an outer scope resolves the problem. ---- - src/structs/release.rs | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/structs/release.rs b/src/structs/release.rs -index 9ed537e..3c4a434 100644 ---- a/src/structs/release.rs -+++ b/src/structs/release.rs -@@ -1,3 +1,5 @@ -+use std::io::empty; -+ - use colored::Colorize; - use serde::{Deserialize, Serialize}; - -@@ -27,10 +29,11 @@ impl Release { - let published = "Published:".bright_green(); - let created = "Created:".green().dimmed(); - let author = "Author:".blue(); -+ let empty_body = String::from("(empty body)").dimmed(); - let body = if !self.body.is_empty() { -- &self.body.white() -+ self.body.white() - } else { -- &String::from("(empty body)").dimmed() -+ empty_body - }; - - format!( diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 22b326b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-Rust-edition-downgrade-to-2021.patch -0002-Lift-the-empty-body-string-outside-the-let-if.patch