async-stream - new upstream release and fix tests.

diff --git a/src/async-stream/debian/changelog b/src/async-stream/debian/changelog
index 35b3f741b89fbf813ed3c7ff1b94b7110300b9db..6cd7e0e56d9a2b02a61fa9c1802057d7d7462fad 100644 (file)
--- a/src/async-stream/debian/changelog
+++ b/src/async-stream/debian/changelog
@@ -1,3 +1,12 @@
+rust-async-stream (0.3.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package async-stream 0.3.4 from crates.io using debcargo 2.6.0
+  * Skip a couple of "compile_fail" tests whose output seems to vary between
+    different versions of rustc. (Closes: #1034030)
+
+ -- Peter Michael Green <plugwash@debian.org>  Thu, 06 Apr 2023 23:23:13 +0000
+
 rust-async-stream (0.3.3-1) unstable; urgency=medium
 
   * Package async-stream 0.3.3 from crates.io using debcargo 2.5.0

diff --git a/src/async-stream/debian/copyright b/src/async-stream/debian/copyright
index b11394f21f1c513aad6673f4fe01f60d9dbb7a66..1ab5427e70962ab1bf3f8d8931cd6e4d67601789 100644 (file)
--- a/src/async-stream/debian/copyright
+++ b/src/async-stream/debian/copyright
@@ -4,14 +4,14 @@ Upstream-Contact: Tokio Contributors <team@tokio.rs>
 Source: https://github.com/tokio-rs/async-stream
 
 Files: *
-Copyright: 2019-2022 Tokio Contributors <team@tokio.rs>
+Copyright: 2019-2023 Tokio Contributors <team@tokio.rs>
            2019 Carl Lerche <me@carllerche.com>
            2018 David Tolnay <dtolnay@gmail.com>
 License: MIT
 
 Files: debian/*
 Copyright:
- 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
  2022 Matthias Geiger <matthias.geiger1024@tutanota.de>
 License: MIT
 

diff --git a/src/async-stream/debian/copyright.debcargo.hint b/src/async-stream/debian/copyright.debcargo.hint
index 7f318c106eecf7b4d746abbcd140bdbd02d9d475..307453b0f9b1a964e7cf3fb169c16430d78ac5f9 100644 (file)
--- a/src/async-stream/debian/copyright.debcargo.hint
+++ b/src/async-stream/debian/copyright.debcargo.hint
@@ -12,7 +12,7 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE
+Files: LICENSE
 Copyright:
  2019 Carl Lerche
  2018 David Tolnay
@@ -23,8 +23,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2022 Matthias Geiger <matthias.geiger1024@tutanota.de>
+ 2022-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022-2023 Matthias Geiger <matthias.geiger1024@tutanota.de>
 License: MIT
 
 License: MIT

diff --git a/src/async-stream/debian/patches/disable-tests-compiler-version-sensitive.patch b/src/async-stream/debian/patches/disable-tests-compiler-version-sensitive.patch
new file mode 100644 (file)
index 0000000..7fd202c
--- /dev/null
+++ b/src/async-stream/debian/patches/disable-tests-compiler-version-sensitive.patch
@@ -0,0 +1,21 @@
+Index: async-stream/tests/stream.rs
+===================================================================
+--- async-stream.orig/tests/stream.rs
++++ async-stream/tests/stream.rs
+@@ -233,5 +233,15 @@ fn inner_try_stream() {
+ #[test]
+ fn test() {
+     let t = trybuild::TestCases::new();
+-    t.compile_fail("tests/ui/*.rs");
++    use std::fs::{self, DirEntry};
++    for entry in fs::read_dir("tests/ui").unwrap() {
++        let entry = entry.unwrap();
++        let path = entry.path();
++        let path = path.to_str().unwrap();
++        println!("{}",path);
++        if !path.ends_with(".rs") { continue }; //igore files that don't end in .rs
++        if path.ends_with("/yield_in_closure.rs") { continue }; // test seems sensitive to compiler version
++        if path.ends_with("/yield_in_async.rs") { continue }; // test seems sensitive to compiler version
++        t.compile_fail(path);
++    }
+ }

diff --git a/src/async-stream/debian/patches/series b/src/async-stream/debian/patches/series
new file mode 100644 (file)
index 0000000..c3bfdc5
--- /dev/null
+++ b/src/async-stream/debian/patches/series
@@ -0,0 +1 @@
+disable-tests-compiler-version-sensitive.patch