From 0e0f92d0fd6fefeb15cd30101e2c9bded60dbc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 13 Sep 2019 20:29:21 +0200 Subject: [PATCH] Bump quickcheck to 0.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- 0001-Fix-inclusive-range.patch | 24 ++++++++++++++++++++++++ difference-fix-metadata.diff | 6 +++--- rust-difference.spec | 10 ++++++++-- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 0001-Fix-inclusive-range.patch diff --git a/0001-Fix-inclusive-range.patch b/0001-Fix-inclusive-range.patch new file mode 100644 index 0000000..65fedc7 --- /dev/null +++ b/0001-Fix-inclusive-range.patch @@ -0,0 +1,24 @@ +From f96d339a2ad8535de6cb193d49e75bc10f90a8db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= + <30413512+eclipseo@users.noreply.github.com> +Date: Sat, 14 Sep 2019 22:35:43 +0200 +Subject: [PATCH] Use ..= for an inclusive range instead of deprecated ... + +https://github.com/rust-lang/rust/issues/51043 +--- + src/display.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/display.rs b/src/display.rs +index 826cb10..2563974 100644 +--- a/src/display.rs ++++ b/src/display.rs +@@ -68,7 +68,7 @@ mod tests { + // 9 => print!("{}", *b as char), // TAB + b'\n' => print!("\\n"), + b'\r' => print!("\\r"), +- 32...126 => print!("{}", *b as char), // visible ASCII ++ 32..=126 => print!("{}", *b as char), // visible ASCII + _ => print!(r"\x{:0>2x}", b), + + } diff --git a/difference-fix-metadata.diff b/difference-fix-metadata.diff index ef4bc6d..21a0b86 100644 --- a/difference-fix-metadata.diff +++ b/difference-fix-metadata.diff @@ -1,5 +1,5 @@ ---- difference-2.0.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ difference-2.0.0/Cargo.toml 2019-06-21T19:38:43.050593+00:00 +--- difference-2.0.0/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ difference-2.0.0/Cargo.toml 2019-09-13T18:26:35.178734+00:00 @@ -25,17 +25,13 @@ [[bin]] name = "difference" @@ -9,7 +9,7 @@ -optional = true [dev-dependencies.quickcheck] -version = "0.4" -+version = "0.8" ++version = "0.9" [dev-dependencies.term] -version = "0.2.7" diff --git a/rust-difference.spec b/rust-difference.spec index 85aa674..e3da428 100644 --- a/rust-difference.spec +++ b/rust-difference.spec @@ -9,7 +9,7 @@ Name: rust-%{crate} Version: 2.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Rust text diffing and assertion library # Upstream license specification: MIT @@ -18,9 +18,12 @@ URL: https://crates.io/crates/difference Source: %{crates_source} # Initial patched metadata # * Bump term to 0.5, https://github.com/johannhof/difference.rs/commit/01fb76830c72a716300b20c66866a226286e8670 -# * Bump quickcheck to 0.7, https://github.com/johannhof/difference.rs/pull/38 +# * Bump quickcheck to 0.9, https://github.com/johannhof/difference.rs/pull/38 # * Remove bin feature, it is useless Patch0: difference-fix-metadata.diff +# Use ..= for an inclusive range instead of deprecated ... +# https://github.com/johannhof/difference.rs/pull/41 +Patch1: https://patch-diff.githubusercontent.com/raw/johannhof/difference.rs/pull/41.patch#/0001-Fix-inclusive-range.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -80,6 +83,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Fri Sep 13 20:26:35 CEST 2019 Robert-André Mauchin - 2.0.0-11 +- Bump quickcheck to 0.9 + * Fri Jul 26 2019 Fedora Release Engineering - 2.0.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild