Bug#988453: rust-rustyline 3.0.0-2+deb10u2 flagged for acceptance

[peter green <plugwash@p10link.net>]

On 11/06/2021 18:21, Adam D Barratt wrote:
> package release.debian.org
> tags 988453 = buster pending
> thanks
>
> Hi,
>
> The upload referenced by this bug report has been flagged for acceptance into the proposed-updates queue for Debian buster.

Thanks, unfortunately I've discovered yet another issue (sorry I should have spotted this
earlier, but buildd.debian.org misleadingly says "uncompiled").

The upstream commit I applied fixes the build with rustc 1.41 but breaks it with 1.34, buster
armel still has rustc 1.34, so this means that the 3.0.0-2+deb10u2  upload FTBFS on armel.

To make the code build with both rustc versions another upstream commit was needed, I have
applied this and prepared a debdiff, should I upload it?

diff -Nru rust-rustyline-3.0.0/debian/changelog rust-rustyline-3.0.0/debian/changelog
--- rust-rustyline-3.0.0/debian/changelog	2021-06-11 14:49:59.000000000 +0000
+++ rust-rustyline-3.0.0/debian/changelog	2021-06-12 15:19:47.000000000 +0000
@@ -1,3 +1,11 @@
+rust-rustyline (3.0.0-2+deb10u3) buster; urgency=medium
+
+  * Team upload.
+  * Apply another upstream patch so that the code builds with
+    both rustc 1.34 and rustc 1.41
+
+ -- Peter Michael Green <plugwash@debian.org>  Sat, 12 Jun 2021 15:19:47 +0000
+
 rust-rustyline (3.0.0-2+deb10u2) buster; urgency=medium
 
   * Team upload.
diff -Nru rust-rustyline-3.0.0/debian/patches/newer-rustc.patch rust-rustyline-3.0.0/debian/patches/newer-rustc.patch
--- rust-rustyline-3.0.0/debian/patches/newer-rustc.patch	2021-05-04 09:26:41.000000000 +0000
+++ rust-rustyline-3.0.0/debian/patches/newer-rustc.patch	2021-06-12 15:19:17.000000000 +0000
@@ -1,3 +1,8 @@
+This patch combines the two upstream commits below, the patched code has been
+tested to build succesfully on both rustc 1.34 (in buster armel at the time of
+writing) and rustc 1.41 (in buster on other architectures at the time of 
+writing)
+
 commit e383956f3fc9f313d8cf979f1a9772bea9eb1eb8
 Author: gwenn <gtreguier@gmail.com>
 Date:   Fri May 17 19:20:14 2019 +0200
@@ -6,25 +11,29 @@
     
     See #217
 
-diff --git a/examples/example.rs b/examples/example.rs
-index 8bb2e7e..204791f 100644
---- a/examples/example.rs
-+++ b/examples/example.rs
-@@ -80,8 +80,8 @@ fn main() {
-     loop {
+commit 6e5099f644d81e8546bf4a1a2c21e002597f5bc6
+Author: gwenn <gtreguier@gmail.com>
+Date:   Fri May 17 20:52:06 2019 +0200
+
+    Another try
+
+Index: rust-rustyline-3.0.0/examples/example.rs
+===================================================================
+--- rust-rustyline-3.0.0.orig/examples/example.rs
++++ rust-rustyline-3.0.0/examples/example.rs
+@@ -76,7 +76,7 @@ fn main() {
          let readline = rl.readline(PROMPT);
          match readline {
--            Ok(line) => {
+             Ok(line) => {
 -                rl.add_history_entry(line.as_ref());
-+            Ok(ref line) => {
-+                rl.add_history_entry(line);
++                rl.add_history_entry(line.as_str());
                  println!("Line: {}", line);
              }
              Err(ReadlineError::Interrupted) => {
-diff --git a/src/history.rs b/src/history.rs
-index b1cb596..b7cc317 100644
---- a/src/history.rs
-+++ b/src/history.rs
+Index: rust-rustyline-3.0.0/src/history.rs
+===================================================================
+--- rust-rustyline-3.0.0.orig/src/history.rs
++++ rust-rustyline-3.0.0/src/history.rs
 @@ -148,7 +148,7 @@ impl History {
          let file = File::open(&path)?;
          let rdr = BufReader::new(file);
@@ -34,16 +43,16 @@
          }
          Ok(())
      }
-diff --git a/src/lib.rs b/src/lib.rs
-index 4f6162b..54672fb 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -624,7 +624,7 @@ fn readline_raw<H: Helper>(
+Index: rust-rustyline-3.0.0/src/lib.rs
+===================================================================
+--- rust-rustyline-3.0.0.orig/src/lib.rs
++++ rust-rustyline-3.0.0/src/lib.rs
+@@ -652,7 +652,7 @@ fn readline_raw<H: Helper>(
      let user_input = readline_edit(prompt, initial, editor, &original_mode);
      if editor.config.auto_add_history() {
          if let Ok(ref line) = user_input {
 -            editor.add_history_entry(line.as_ref());
-+            editor.add_history_entry(line);
++            editor.add_history_entry(line.as_str());
          }
      }
      drop(guard); // disable_raw_mode(original_mode)?;