* Package ring 0.16.9 from crates.io using debcargo 2.4.2

* use-array-iter.patch: Fix usage of array::into_iter
  Thanks to Logan Rosen (Closes: #961387)

diff --git a/src/ring/debian/changelog b/src/ring/debian/changelog
index 1e05f08e17c7be53dd80c39ed18e09ffa5f4449c..b6ee6cb8586c7ecee96ddbd91e78c4a3c79067fc 100644 (file)
--- a/src/ring/debian/changelog
+++ b/src/ring/debian/changelog
@@ -1,3 +1,11 @@
+rust-ring (0.16.9-4) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package ring 0.16.9 from crates.io using debcargo 2.4.2
+  * use-array-iter.patch: Fix usage of array::into_iter
+    Thanks to Logan Rosen (Closes: #961387)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 23 May 2020 23:17:42 +0200
+
 rust-ring (0.16.9-3) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/ring/debian/patches/series b/src/ring/debian/patches/series
index fb3863b86bdcaffabc09379d7d145bf97913f3b7..38c6c5dd643d5c3e0d850c55479be1f0633a703a 100644 (file)
--- a/src/ring/debian/patches/series
+++ b/src/ring/debian/patches/series
@@ -1,2 +1,4 @@
 relax-deps.patch
 built-using.patch
+use-array-iter.patch
+

diff --git a/src/ring/debian/patches/use-array-iter.patch b/src/ring/debian/patches/use-array-iter.patch
new file mode 100644 (file)
index 0000000..cb693a1
--- /dev/null
+++ b/src/ring/debian/patches/use-array-iter.patch
@@ -0,0 +1,23 @@
+From c250e3125e2621cbe947e811e3de0fc5fa1904aa Mon Sep 17 00:00:00 2001
+From: lzutao <taolzu@gmail.com>
+Date: Wed, 30 Oct 2019 14:51:17 +0700
+Subject: [PATCH] Use array::iter
+
+See clippy::into_iter lint and https://github.com/rust-lang/rust/pull/65819
+---
+ build.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.rs b/build.rs
+index c6cb3a700..f7eded9de 100644
+--- a/build.rs
++++ b/build.rs
+@@ -418,7 +418,7 @@ fn build_c_code(target: &Target, pregenerated: PathBuf, out_dir: &Path) {
+ 
+     // XXX: Ideally, ring-test would only be built for `cargo test`, but Cargo
+     // can't do that yet.
+-    libs.into_iter()
++    libs.iter()
+         .for_each(|&(lib_name, srcs, additional_srcs)| {
+             build_library(
+                 &target,