Update to version 0.6.18; Fixes RHBZ#2323703

.gitignore

@@ -4,3 +4,10 @@
 /anstream-0.6.4.crate
 /anstream-0.6.5.crate
 /anstream-0.6.7.crate
+/anstream-0.6.11.crate
+/anstream-0.6.12.crate
+/anstream-0.6.13.crate
+/anstream-0.6.14.crate
+/anstream-0.6.15.crate
+/anstream-0.6.17.crate
+/anstream-0.6.18.crate

0001-drop-is_terminal_polyfill-and-replace-with-std-io-Is.patch

@@ -0,0 +1,25 @@
+From e0641952e15e81afd101652240828d30d7ee6726 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Tue, 2 Jul 2024 14:24:40 +0200
+Subject: [PATCH] drop is_terminal_polyfill and replace with
+ std::io::IsTerminal
+
+---
+ src/stream.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/stream.rs b/src/stream.rs
+index b30d232..e8472c1 100644
+--- a/src/stream.rs
++++ b/src/stream.rs
+@@ -1,5 +1,7 @@
+ //! Higher-level traits to describe writeable streams
+ 
++use std::io as is_terminal_polyfill;
++
+ /// Required functionality for underlying [`std::io::Write`] for adaptation
+ #[cfg(not(all(windows, feature = "wincon")))]
+ pub trait RawStream: std::io::Write + IsTerminal + private::Sealed {}
+-- 
+2.45.2
+

anstream-fix-metadata-auto.diff

@@ -1,12 +1,20 @@
---- anstream-0.6.7/Cargo.toml	1970-01-01T00:00:01+00:00
+--- anstream-0.6.18/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ anstream-0.6.7/Cargo.toml	2024-01-13T20:33:07.049395+00:00
++++ anstream-0.6.18/Cargo.toml	2024-11-12T19:40:40.845345+00:00
-@@ -137,8 +137,5 @@
+@@ -155,11 +155,7 @@
      "wincon",
  ]
  test = []
 -wincon = ["dep:anstyle-wincon"]
-+wincon = []
+-
- 
 -[target."cfg(windows)".dependencies.anstyle-wincon]
--version = "3.0.1"
+-version = "3.0.5"
 -optional = true
++wincon = []
+ 
+ [lints.clippy]
+ bool_assert_comparison = "allow"
+@@ -231,3 +227,4 @@
+ [lints.rust.rust_2018_idioms]
+ level = "warn"
+ priority = -1
++

anstream-fix-metadata.diff

@@ -1,40 +1,39 @@
---- anstream-0.6.7/Cargo.toml	1970-01-01T00:00:01+00:00
+--- anstream-0.6.18/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ anstream-0.6.7/Cargo.toml	2024-01-13T20:33:29.402484+00:00
++++ anstream-0.6.18/Cargo.toml	2024-11-12T19:40:54.672409+00:00
-@@ -83,18 +83,6 @@
+@@ -99,21 +99,6 @@
- [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD"""
+ path = "examples/query-stream.rs"
- search = "<!-- next-url -->"
+ required-features = ["auto"]
  
 -[[bench]]
--name = "strip"
+-name = "stream"
+-path = "benches/stream.rs"
 -harness = false
 -
 -[[bench]]
--name = "wincon"
+-name = "strip"
+-path = "benches/strip.rs"
 -harness = false
 -
 -[[bench]]
--name = "stream"
+-name = "wincon"
+-path = "benches/wincon.rs"
 -harness = false
 -
  [dependencies.anstyle]
  version = "1.0.0"
  
-@@ -111,9 +99,6 @@
+@@ -127,14 +112,8 @@
+ [dependencies.colorchoice]
+ version = "1.0.0"
  
+-[dependencies.is_terminal_polyfill]
+-version = "1.48"
+-
  [dependencies.utf8parse]
  version = "0.2.1"
 -
--[dev-dependencies.criterion]
+-[dev-dependencies.divan]
--version = "0.5.1"
+-version = "0.1.11"
  
  [dev-dependencies.lexopt]
  version = "0.3.0"
-@@ -134,8 +119,5 @@
- ]
- default = [
-     "auto",
--    "wincon",
- ]
- test = []
--wincon = []
--

rust-anstream.spec

@@ -1,11 +1,11 @@
-# Generated by rust2rpm 25
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate anstream
 
 Name:           rust-anstream
-Version:        0.6.7
+Version:        0.6.18
 Release:        %autorelease
 Summary:        Simple cross platform library for writing colored text to a terminal
 
@@ -15,9 +15,10 @@ Source:         %{crates_source}
 # Automatically generated patch to strip dependencies and normalize metadata
 Patch:          anstream-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
-# * drop unused, benchmark-only criterion dev-dependency
+# * drop unused, benchmark-only divan dev-dependency
-# * drop Windows-specific features
+# * drop unnecessary is-terminal polyfill (MSRV 1.65 -> 1.70 is OK downstream)
 Patch:          anstream-fix-metadata.diff
+Patch:          0001-drop-is_terminal_polyfill-and-replace-with-std-io-Is.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -77,6 +78,18 @@ use the "test" feature of the "%{crate}" crate.
 %files       -n %{name}+test-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+wincon-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+wincon-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "wincon" feature of the "%{crate}" crate.
+
+%files       -n %{name}+wincon-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %prep
 %autosetup -n %{crate}-%{version} -p1
 %cargo_prep

rust2rpm.toml

@@ -0,0 +1,6 @@
+[package]
+cargo-toml-patch-comments = [
+    "drop unused, benchmark-only divan dev-dependency",
+    "drop unnecessary is-terminal polyfill (MSRV 1.65 -> 1.70 is OK downstream)",
+]
+

sources

@@ -1 +1 @@
-SHA512 (anstream-0.6.7.crate) = 54231141acec85947e4b24f2a27c02c406a2cfe40e92a39b4f38c4b5234e1ca8a27021bb15c759c927d40448ad6203656a3841cc51e480b962fb1ebf199a3522
+SHA512 (anstream-0.6.18.crate) = 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963