public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-icu_normalizer] f44: Update to version 2.3.0; Fixes RHBZ#2515889
@ 2026-08-28 15:11 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-08-28 15:11 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-icu_normalizer
Branch : f44
Commit : 2904fc8b044e65ee0aef114b3e4cb253e6c6a312
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-08-27T12:04:43+01:00
Stats  : +10/-153 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-icu_normalizer/c/2904fc8b044e65ee0aef114b3e4cb253e6c6a312?branch=f44

Log:
Update to version 2.3.0; Fixes RHBZ#2515889

---
diff --git a/icu_normalizer-2.0.0-no-arraystring-tests.patch b/icu_normalizer-2.0.0-no-arraystring-tests.patch
deleted file mode 100644
index 04e8509..0000000
--- a/icu_normalizer-2.0.0-no-arraystring-tests.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -Naur icu_normalizer-2.0.0-original/tests/tests.rs icu_normalizer-2.0.0/tests/tests.rs
---- icu_normalizer-2.0.0-original/tests/tests.rs	2006-07-23 21:21:28.000000000 -0400
-+++ icu_normalizer-2.0.0/tests/tests.rs	2025-07-13 09:52:22.569644493 -0400
-@@ -431,8 +431,12 @@
-     );
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- type StackString = arraystring::ArrayString<arraystring::typenum::U48>;
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_nfd_str_to() {
-     let normalizer = DecomposingNormalizerBorrowed::new_nfd();
-@@ -446,6 +450,8 @@
-     assert_eq!(&buf, "e\u{0323}\u{0302}");
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_nfd_utf8_to() {
-     let normalizer = DecomposingNormalizerBorrowed::new_nfd();
-@@ -482,6 +488,8 @@
-     assert_eq!(&buf, [0x0065u16, 0x0323u16, 0x0302u16].as_slice());
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_nfc_str_to() {
-     let normalizer = ComposingNormalizerBorrowed::new_nfc();
-@@ -497,6 +505,8 @@
-     assert_eq!(&buf, "ệ");
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_nfc_utf8_to() {
-     let normalizer = ComposingNormalizerBorrowed::new_nfc();
-@@ -531,6 +541,8 @@
-     assert_eq!(&buf, [0x1EC7u16].as_slice());
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_nfc_utf8_to_errors() {
-     let normalizer = ComposingNormalizerBorrowed::new_nfc();
-@@ -560,6 +572,8 @@
-     assert_eq!(&buf, "aaa\u{FFFD}aaa\u{FFFD}aaa");
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_nfd_utf8_to_errors() {
-     let normalizer = DecomposingNormalizerBorrowed::new_nfd();
-@@ -806,6 +820,8 @@
- use atoi::FromRadix16;
- use icu_properties::props::CanonicalCombiningClass;
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- /// Parse five semicolon-terminated strings consisting of space-separated hexadecimal scalar values
- fn parse_hex(mut hexes: &[u8]) -> [StackString; 5] {
-     let mut strings = [
-@@ -839,6 +855,8 @@
-     }
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_conformance() {
-     let nfd = DecomposingNormalizerBorrowed::new_nfd();
-@@ -1023,16 +1041,22 @@
-         .unwrap();
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- fn str_to_str(s: &str, sink: &mut StackString) {
-     sink.clear();
-     sink.try_push_str(s).unwrap();
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- fn char_to_str(c: char, sink: &mut StackString) {
-     sink.clear();
-     sink.try_push(c).unwrap();
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_conformance_utf16() {
-     let nfd = DecomposingNormalizerBorrowed::new_nfd();
-@@ -1246,6 +1270,8 @@
-     }
- }
- 
-+// Downstream: patch out tests requiring arraystring
-+#[cfg(any())]
- #[test]
- fn test_conformance_utf8() {
-     let nfd = DecomposingNormalizerBorrowed::new_nfd();

diff --git a/icu_normalizer-fix-metadata.diff b/icu_normalizer-fix-metadata.diff
index 410f03c..d5cef0c 100644
--- a/icu_normalizer-fix-metadata.diff
+++ b/icu_normalizer-fix-metadata.diff
@@ -1,5 +1,5 @@
---- icu_normalizer-2.2.0/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ icu_normalizer-2.2.0/Cargo.toml	2026-04-18T09:49:55.696041+00:00
+--- icu_normalizer-2.3.0/Cargo.toml	2006-07-24T01:21:28+00:00
++++ icu_normalizer-2.3.0/Cargo.toml	2026-08-27T11:04:01.018918+00:00
 @@ -20,7 +20,6 @@
      "data/**/*",
      "src/**/*",
@@ -8,26 +8,17 @@
      "tests/**/*",
      "Cargo.toml",
      "LICENSE",
-@@ -198,18 +197,12 @@
- version = "0.11.6"
- default-features = false
- 
--[dev-dependencies.arraystring]
--version = "0.3.0"
--
- [dev-dependencies.arrayvec]
- version = "0.7.2"
- default-features = false
- 
+@@ -202,9 +201,6 @@
  [dev-dependencies.atoi]
  version = "2.0.0"
--
+ 
 -[dev-dependencies.detone]
 -version = "1.0.0"
- 
+-
  [dev-dependencies.write16]
  version = "1.0.0"
-@@ -218,9 +211,6 @@
+ features = [
+@@ -212,9 +208,6 @@
      "smallvec",
  ]
  default-features = false
@@ -36,4 +27,4 @@
 -version = "0.5.0"
  
  [lints.clippy]
- alloc-instead-of-core = "warn"
+ alloc_instead_of_core = "warn"

diff --git a/rust-icu_normalizer.spec b/rust-icu_normalizer.spec
index 4812f72..31b6d20 100644
--- a/rust-icu_normalizer.spec
+++ b/rust-icu_normalizer.spec
@@ -5,7 +5,7 @@
 %global crate icu_normalizer
 
 Name:           rust-icu_normalizer
-Version:        2.2.0
+Version:        2.3.0
 Release:        %autorelease
 Summary:        API for normalizing text into Unicode Normalization Forms
 
@@ -15,14 +15,7 @@ Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * Omit benchmark-only dev-dependencies criterion and detone
 # * Do not package benchmarks or benchmark data
-# * Remove the dev-dependency on arraystring, which does not appear actively
-#   maintained, and which we do not want to package, at the cost of some of the
-#   tests.
 Patch:          icu_normalizer-fix-metadata.diff
-# * Downstream-only: unconditionally skip compiling tests that would require the
-#   arraystring crate. It does not appear actively maintained, and we do not
-#   wish to package it solely for these tests.
-Patch10:        icu_normalizer-2.0.0-no-arraystring-tests.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 9a7287d..cd39331 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -2,11 +2,6 @@
 cargo-toml-patch-comments = [
     "Omit benchmark-only dev-dependencies criterion and detone",
     "Do not package benchmarks or benchmark data",
-    """\
-Remove the dev-dependency on arraystring, which does not appear actively \
-maintained, and which we do not want to package, at the cost of some of the \
-tests.\
-""",
 ]
 
 [features]
@@ -15,17 +10,6 @@ enable = [
     "icu_properties",
 ]
 
-[[package.extra-patches]]
-number = 10
-file = "icu_normalizer-2.0.0-no-arraystring-tests.patch"
-comments = [
-    """\
-Downstream-only: unconditionally skip compiling tests that would require the \
-arraystring crate. It does not appear actively maintained, and we do not wish \
-to package it solely for these tests. \
-"""
-]
-
 [tests]
 comments = [
     """\

diff --git a/sources b/sources
index bea8c01..e98a0e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (icu_normalizer-2.2.0.crate) = 98e48fcfe47623c592feee082264f50e96a82d89fa17e89d5d94de8e1cf3ec2529625954947d9b3bf9746f1cf0062b3abfd2d8f7cfa3b8e445c98284fbbc7023
+SHA512 (icu_normalizer-2.3.0.crate) = 34cee1d05ab37887f006cd2f842272be60a44667dec33fb79722e815e01f0cbabd0450c1cd78af68345426ac1269dc2b7e99e806bb29baa50f9b6d5d14024867

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-28 15:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-28 15:11 [rpms/rust-icu_normalizer] f44: Update to version 2.3.0; Fixes RHBZ#2515889 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox