Drop unused compat support for futures 0.1

.gitignore

@@ -29,3 +29,4 @@
 /futures-0.3.27.crate
 /futures-0.3.28.crate
 /futures-0.3.30.crate
+/futures-0.3.31.crate

0001-Fix-compiling-tests-with-compat-and-io-compat-featur.patch

@@ -0,0 +1,25 @@
+From aaf6eab5c13e1d63f33f4ddf5a08ca1140f44959 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Sun, 1 Sep 2024 02:28:28 +0200
+Subject: [PATCH] Fix compiling tests with compat and io-compat feature removed
+
+---
+ tests/_require_features.rs | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/_require_features.rs b/tests/_require_features.rs
+index 8046cc9..e04b4ff 100644
+--- a/tests/_require_features.rs
++++ b/tests/_require_features.rs
+@@ -2,8 +2,6 @@
+     feature = "std",
+     feature = "alloc",
+     feature = "async-await",
+-    feature = "compat",
+-    feature = "io-compat",
+     feature = "executor",
+     feature = "thread-pool",
+ )))]
+-- 
+2.47.0
+

futures-fix-metadata.diff

@@ -1,12 +1,53 @@
---- futures-0.3.30/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ futures-0.3.30/Cargo.toml	2023-12-27T21:28:33.470398+00:00
-@@ -80,6 +80,9 @@
+--- futures-0.3.31/Cargo.toml	1970-01-01T00:00:01+00:00
++++ futures-0.3.31/Cargo.toml	2024-10-13T12:15:28.585671+00:00
+@@ -72,10 +72,6 @@
+ path = "tests/bilock.rs"
+ 
+ [[test]]
+-name = "compat"
+-path = "tests/compat.rs"
+-
+-[[test]]
+ name = "eager_drop"
+ path = "tests/eager_drop.rs"
+ 
+@@ -317,14 +313,14 @@
  [dev-dependencies.assert_matches]
  version = "1.3.0"
  
 +[dev-dependencies.futures-test]
-+version = "=0.3.30"
++version = "=0.3.31"
 +
  [dev-dependencies.pin-project]
  version = "1.0.11"
  
+ [dev-dependencies.static_assertions]
+ version = "1"
+-
+-[dev-dependencies.tokio]
+-version = "0.1.11"
+ 
+ [features]
+ alloc = [
+@@ -340,10 +336,6 @@
+ ]
+ bilock = ["futures-util/bilock"]
+ cfg-target-has-atomic = []
+-compat = [
+-    "std",
+-    "futures-util/compat",
+-]
+ default = [
+     "std",
+     "async-await",
+@@ -352,10 +344,6 @@
+ executor = [
+     "std",
+     "futures-executor/std",
+-]
+-io-compat = [
+-    "compat",
+-    "futures-util/io-compat",
+ ]
+ std = [
+     "alloc",

rust-futures.spec

@@ -1,11 +1,11 @@
-# Generated by rust2rpm 25
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate futures
 
 Name:           rust-futures
-Version:        0.3.30
+Version:        0.3.31
 Release:        %autorelease
 Summary:        Implementation of futures and streams
 
@@ -14,7 +14,10 @@ URL:            https://crates.io/crates/futures
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * add missing futures-test dev-dependency
+# * drop unused compat support for futures 0.1
+# * drop unused compat support for tokio 0.1
 Patch:          futures-fix-metadata.diff
+Patch10:        0001-Fix-compiling-tests-with-compat-and-io-compat-featur.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -99,18 +102,6 @@ use the "cfg-target-has-atomic" feature of the "%{crate}" crate.
 %files       -n %{name}+cfg-target-has-atomic-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+compat-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+compat-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "compat" feature of the "%{crate}" crate.
-
-%files       -n %{name}+compat-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+executor-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -135,18 +126,6 @@ use the "futures-executor" feature of the "%{crate}" crate.
 %files       -n %{name}+futures-executor-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+io-compat-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+io-compat-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "io-compat" feature of the "%{crate}" crate.
-
-%files       -n %{name}+io-compat-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+std-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -198,6 +177,8 @@ use the "write-all-vectored" feature of the "%{crate}" crate.
 %prep
 %autosetup -n %{crate}-%{version} -p1
 %cargo_prep
+# drop single test that depends on tokio 0.1
+rm tests/compat.rs
 
 %generate_buildrequires
 %cargo_generate_buildrequires -a
@@ -210,11 +191,11 @@ use the "write-all-vectored" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-# * always skip a test that is officially "flaky"
-# * skip a possibly flaky test:
+# * always skip a test that is officially "flaky" (stream_select)
+# * skip a possibly flaky test (many_threads):
 #   https://github.com/rust-lang/futures-rs/issues/2539
-# * skip a test which fails depending on Rust version:
-#   sizes of some structs and enums changed between Rust 1.62 and 1.63
+# * skip a test which fails depending on Rust version (join_size): sizes of some
+#   structs and enums changed between Rust 1.62 and 1.63
 %cargo_test -a -- -- --skip stream_select --skip many_threads --skip join_size
 %endif
 

rust2rpm.toml

@@ -1,6 +1,33 @@
 [package]
 summary = "Implementation of futures and streams"
+cargo-toml-patch-comments = [
+    "add missing futures-test dev-dependency",
+    "drop unused compat support for futures 0.1",
+    "drop unused compat support for tokio 0.1",
+]
+
+[[package.extra-patches]]
+number = 10
+file = "0001-Fix-compiling-tests-with-compat-and-io-compat-featur.patch"
 
 [features]
 enable-all = true
 
+[scripts]
+prep.post = [
+    "# drop single test that depends on tokio 0.1",
+    "rm tests/compat.rs",
+]
+
+[tests]
+skip = [
+    "stream_select",
+    "many_threads",
+    "join_size",
+]
+comments = [
+    "always skip a test that is officially \"flaky\" (stream_select)",
+    "skip a possibly flaky test (many_threads): https://github.com/rust-lang/futures-rs/issues/2539",
+    "skip a test which fails depending on Rust version (join_size): sizes of some structs and enums changed between Rust 1.62 and 1.63",
+]
+

sources

@@ -1 +1 @@
-SHA512 (futures-0.3.30.crate) = 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
+SHA512 (futures-0.3.31.crate) = a08d23cdac9e162d0e6ae72bd792201ff4e13d7ade6b498cc597149b3df2062b06814804c0750d941d8b5be5d2ab4cfebbe2d08a98d875d2092bf25e6e71a51d