From b0df0bba39aab578ad6459912698ccb064e44353 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 17 Oct 2023 19:02:36 +0200 Subject: [PATCH] Update to version 1.10.2; Fixes RHBZ#2244494 --- .gitignore | 1 + ...ation-of-doctests-on-32-bit-architec.patch | 59 ------------------- rust-regex.spec | 3 +- sources | 2 +- 4 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 0001-regex-fix-compilation-of-doctests-on-32-bit-architec.patch diff --git a/.gitignore b/.gitignore index 92e49b6..0e28f92 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /regex-1.9.4.crate /regex-1.9.5.crate /regex-1.10.1.crate +/regex-1.10.2.crate diff --git a/0001-regex-fix-compilation-of-doctests-on-32-bit-architec.patch b/0001-regex-fix-compilation-of-doctests-on-32-bit-architec.patch deleted file mode 100644 index a679f3a..0000000 --- a/0001-regex-fix-compilation-of-doctests-on-32-bit-architec.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 8531cfcaf8baf9ac54c3faf2e5746ced7dcac0af Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Sun, 15 Oct 2023 01:52:14 +0200 -Subject: [PATCH] regex: fix compilation of doctests on 32-bit architectures - ---- - src/regex/bytes.rs | 4 +++- - src/regex/string.rs | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/regex/bytes.rs b/src/regex/bytes.rs -index c742b09..19f5701 100644 ---- a/src/regex/bytes.rs -+++ b/src/regex/bytes.rs -@@ -2025,7 +2025,6 @@ impl<'h, 'n> core::ops::Index<&'n str> for Captures<'h> { - /// This example shows how to create and use `CaptureLocations` in a search. - /// - /// ``` --/// # if !cfg!(target_pointer_width = "64") { return; } // see #1041 - /// use regex::bytes::Regex; - /// - /// let re = Regex::new(r"(?\w+)\s+(?\w+)").unwrap(); -@@ -2038,7 +2037,10 @@ impl<'h, 'n> core::ops::Index<&'n str> for Captures<'h> { - /// - /// // Asking for an invalid capture group always returns None. - /// assert_eq!(None, locs.get(3)); -+/// # // literals are too big for 32-bit usize: #1041 -+/// # #[cfg(target_pointer_width = "64")] - /// assert_eq!(None, locs.get(34973498648)); -+/// # #[cfg(target_pointer_width = "64")] - /// assert_eq!(None, locs.get(9944060567225171988)); - /// ``` - #[derive(Clone, Debug)] -diff --git a/src/regex/string.rs b/src/regex/string.rs -index 177a2af..880d608 100644 ---- a/src/regex/string.rs -+++ b/src/regex/string.rs -@@ -2028,7 +2028,6 @@ impl<'h, 'n> core::ops::Index<&'n str> for Captures<'h> { - /// This example shows how to create and use `CaptureLocations` in a search. - /// - /// ``` --/// # if !cfg!(target_pointer_width = "64") { return; } // see #1041 - /// use regex::Regex; - /// - /// let re = Regex::new(r"(?\w+)\s+(?\w+)").unwrap(); -@@ -2041,7 +2040,10 @@ impl<'h, 'n> core::ops::Index<&'n str> for Captures<'h> { - /// - /// // Asking for an invalid capture group always returns None. - /// assert_eq!(None, locs.get(3)); -+/// # // literals are too big for 32-bit usize: #1041 -+/// # #[cfg(target_pointer_width = "64")] - /// assert_eq!(None, locs.get(34973498648)); -+/// # #[cfg(target_pointer_width = "64")] - /// assert_eq!(None, locs.get(9944060567225171988)); - /// ``` - #[derive(Clone, Debug)] --- -2.41.0 - diff --git a/rust-regex.spec b/rust-regex.spec index 7a00802..78a172c 100644 --- a/rust-regex.spec +++ b/rust-regex.spec @@ -5,14 +5,13 @@ %global crate regex Name: rust-regex -Version: 1.10.1 +Version: 1.10.2 Release: %autorelease Summary: Implementation of regular expressions for Rust License: MIT OR Apache-2.0 URL: https://crates.io/crates/regex Source: %{crates_source} -Patch: 0001-regex-fix-compilation-of-doctests-on-32-bit-architec.patch BuildRequires: cargo-rpm-macros >= 24 diff --git a/sources b/sources index 394661d..619cbd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (regex-1.10.1.crate) = cb31447c570b52bd0a1f49ac58903ae1d230162167615163a4940c48f3476369d86e7716cce827ffc7c76a4fd8a179061390d48b86163a25f257efd01dee570a +SHA512 (regex-1.10.2.crate) = e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3