From 3a286cf37ecd32073887e88f9d12e27dede0fcbc Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Mon, 6 Mar 2023 15:54:31 -0600
Subject: [PATCH] Update to 0.45.0

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
---
 .gitignore                   |   2 +
 difftastic-fix-metadata.diff |  22 ++++---
 rust-difftastic.spec         | 121 ++++++++++++++++++-----------------
 sources                      |   4 +-
 4 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6eb24a5..8fb797f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /difftastic-0.42.0-vendor.tar.xz
 /difftastic-0.43.1.crate
 /difftastic-0.43.1-vendor.tar.xz
+/difftastic-0.45.0.crate
+/difftastic-0.45.0-vendor.tar.xz
diff --git a/difftastic-fix-metadata.diff b/difftastic-fix-metadata.diff
index 9248761..76ddb74 100644
--- a/difftastic-fix-metadata.diff
+++ b/difftastic-fix-metadata.diff
@@ -1,11 +1,15 @@
---- difftastic-0.43.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ difftastic-0.43.1/Cargo.toml	2023-02-15T17:28:55.256466+00:00
-@@ -56,7 +56,7 @@
- version = "0.2.108"
+--- difftastic-0.45.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ difftastic-0.45.0/Cargo.toml	2023-03-06T21:40:31.097771+00:00
+@@ -104,10 +104,10 @@
+ [dependencies.wu-diff]
+ version = "0.1.2"
+ [dev-dependencies.assert_cmd]
+-version = "=2.0.5"
++version = "2.0.5"
  
- [dependencies.libmimalloc-sys]
--version = "=0.1.24"
-+version = "0.1.24"
+ [dev-dependencies.predicates]
+-version = "=2.1.1"
++version = "2.1.1"
  
- [dependencies.log]
- version = "0.4.14"
+ [dev-dependencies.pretty_assertions]
+ version = "1.2.1"
diff --git a/rust-difftastic.spec b/rust-difftastic.spec
index 6c79744..3e90edd 100644
--- a/rust-difftastic.spec
+++ b/rust-difftastic.spec
@@ -11,7 +11,7 @@
 %endif
 
 Name:           rust-difftastic
-Version:        0.43.1
+Version:        0.45.0
 Release:        %autorelease
 Summary:        Structural diff that understands syntax
 
@@ -21,7 +21,8 @@ Source:         %{crates_source}
 # vendored dependencies for EPEL 8
 Source100:      %{crate}-%{version}-vendor.tar.xz
 # Manually created patch for downstream crate metadata changes
-# * unpin libmimalloc-sys
+# * unpin assert_cmd
+# * unpin predicates
 Patch:          difftastic-fix-metadata.diff
 
 %if 0%{?el8}
@@ -32,98 +33,105 @@ BuildRequires:  rust-packaging >= 21
 
 # List of bundled crates in vendor tarball, generated with:
 # cargo metadata --locked --format-version 1 | CRATE_NAME="difftastic" ../bundled-provides.jq
-Provides: bundled(crate(aho-corasick)) = 0.7.20
+Provides: bundled(crate(aho-corasick)) = 0.7.18
+Provides: bundled(crate(ansi_term)) = 0.12.1
+Provides: bundled(crate(assert_cmd)) = 2.0.5
 Provides: bundled(crate(atty)) = 0.2.14
 Provides: bundled(crate(autocfg)) = 1.1.0
 Provides: bundled(crate(bitflags)) = 1.3.2
-Provides: bundled(crate(bumpalo)) = 3.12.0
-Provides: bundled(crate(bytecount)) = 0.6.3
-Provides: bundled(crate(cc)) = 1.0.79
+Provides: bundled(crate(bstr)) = 0.2.17
+Provides: bundled(crate(bumpalo)) = 3.11.1
+Provides: bundled(crate(bytecount)) = 0.6.2
+Provides: bundled(crate(cc)) = 1.0.78
 Provides: bundled(crate(cfg-if)) = 1.0.0
-Provides: bundled(crate(clap)) = 3.2.23
-Provides: bundled(crate(clap_lex)) = 0.2.4
-Provides: bundled(crate(const_format)) = 0.2.30
-Provides: bundled(crate(const_format_proc_macros)) = 0.2.29
-Provides: bundled(crate(crossbeam-channel)) = 0.5.6
-Provides: bundled(crate(crossbeam-deque)) = 0.8.2
-Provides: bundled(crate(crossbeam-epoch)) = 0.9.13
-Provides: bundled(crate(crossbeam-utils)) = 0.8.14
+Provides: bundled(crate(clap)) = 3.1.18
+Provides: bundled(crate(clap_lex)) = 0.2.0
+Provides: bundled(crate(const_format)) = 0.2.23
+Provides: bundled(crate(const_format_proc_macros)) = 0.2.22
+Provides: bundled(crate(crossbeam-channel)) = 0.5.4
+Provides: bundled(crate(crossbeam-deque)) = 0.8.1
+Provides: bundled(crate(crossbeam-epoch)) = 0.9.8
+Provides: bundled(crate(crossbeam-utils)) = 0.8.8
 Provides: bundled(crate(crossterm)) = 0.25.0
 Provides: bundled(crate(crossterm_winapi)) = 0.9.0
-Provides: bundled(crate(ctor)) = 0.1.26
-Provides: bundled(crate(diff)) = 0.1.13
-Provides: bundled(crate(either)) = 1.8.1
+Provides: bundled(crate(ctor)) = 0.1.22
+Provides: bundled(crate(diff)) = 0.1.12
+Provides: bundled(crate(difflib)) = 0.4.0
+Provides: bundled(crate(doc-comment)) = 0.3.3
+Provides: bundled(crate(either)) = 1.6.1
 Provides: bundled(crate(env_logger)) = 0.7.1
-Provides: bundled(crate(errno)) = 0.2.8
-Provides: bundled(crate(errno-dragonfly)) = 0.1.2
-Provides: bundled(crate(fixedbitset)) = 0.4.2
+Provides: bundled(crate(fixedbitset)) = 0.4.1
+Provides: bundled(crate(float-cmp)) = 0.9.0
 Provides: bundled(crate(fnv)) = 1.0.7
-Provides: bundled(crate(hashbrown)) = 0.12.3
+Provides: bundled(crate(hashbrown)) = 0.11.2
 Provides: bundled(crate(hermit-abi)) = 0.1.19
-Provides: bundled(crate(hermit-abi)) = 0.2.6
 Provides: bundled(crate(humantime)) = 1.3.0
-Provides: bundled(crate(indexmap)) = 1.9.2
-Provides: bundled(crate(io-lifetimes)) = 1.0.5
-Provides: bundled(crate(itertools)) = 0.10.5
+Provides: bundled(crate(indexmap)) = 1.7.0
+Provides: bundled(crate(itertools)) = 0.10.3
 Provides: bundled(crate(lazy_static)) = 1.4.0
 Provides: bundled(crate(libc)) = 0.2.139
-Provides: bundled(crate(libmimalloc-sys)) = 0.1.30
-Provides: bundled(crate(linux-raw-sys)) = 0.1.4
+Provides: bundled(crate(libmimalloc-sys)) = 0.1.24
 Provides: bundled(crate(lock_api)) = 0.4.9
 Provides: bundled(crate(log)) = 0.4.17
 Provides: bundled(crate(memchr)) = 2.5.0
-Provides: bundled(crate(memoffset)) = 0.7.1
-Provides: bundled(crate(mimalloc)) = 0.1.34
+Provides: bundled(crate(memoffset)) = 0.6.5
+Provides: bundled(crate(mimalloc)) = 0.1.28
 Provides: bundled(crate(minimal-lexical)) = 0.2.1
-Provides: bundled(crate(mio)) = 0.8.6
-Provides: bundled(crate(nom)) = 7.1.3
-Provides: bundled(crate(num_cpus)) = 1.15.0
+Provides: bundled(crate(mio)) = 0.8.5
+Provides: bundled(crate(nom)) = 7.1.1
+Provides: bundled(crate(normalize-line-endings)) = 0.3.0
+Provides: bundled(crate(num-traits)) = 0.2.15
+Provides: bundled(crate(num_cpus)) = 1.13.1
 Provides: bundled(crate(once_cell)) = 1.17.1
-Provides: bundled(crate(os_str_bytes)) = 6.4.1
+Provides: bundled(crate(os_str_bytes)) = 6.0.1
 Provides: bundled(crate(output_vt100)) = 0.1.3
-Provides: bundled(crate(owo-colors)) = 3.5.0
+Provides: bundled(crate(owo-colors)) = 3.4.0
 Provides: bundled(crate(parking_lot)) = 0.12.1
-Provides: bundled(crate(parking_lot_core)) = 0.9.7
-Provides: bundled(crate(petgraph)) = 0.6.3
-Provides: bundled(crate(pretty_assertions)) = 1.3.0
+Provides: bundled(crate(parking_lot_core)) = 0.9.6
+Provides: bundled(crate(petgraph)) = 0.6.1
+Provides: bundled(crate(predicates)) = 2.1.1
+Provides: bundled(crate(predicates-core)) = 1.0.3
+Provides: bundled(crate(predicates-tree)) = 1.0.5
+Provides: bundled(crate(pretty_assertions)) = 1.2.1
 Provides: bundled(crate(pretty_env_logger)) = 0.4.0
-Provides: bundled(crate(proc-macro2)) = 1.0.51
+Provides: bundled(crate(proc-macro2)) = 1.0.39
 Provides: bundled(crate(quick-error)) = 1.2.3
-Provides: bundled(crate(quote)) = 1.0.23
+Provides: bundled(crate(quote)) = 1.0.18
 Provides: bundled(crate(radix-heap)) = 0.4.2
 Provides: bundled(crate(rayon)) = 1.6.1
-Provides: bundled(crate(rayon-core)) = 1.10.2
+Provides: bundled(crate(rayon-core)) = 1.10.1
 Provides: bundled(crate(redox_syscall)) = 0.2.16
-Provides: bundled(crate(regex)) = 1.7.1
-Provides: bundled(crate(regex-syntax)) = 0.6.28
+Provides: bundled(crate(regex)) = 1.5.6
+Provides: bundled(crate(regex-automata)) = 0.1.10
+Provides: bundled(crate(regex-syntax)) = 0.6.26
 Provides: bundled(crate(rustc-hash)) = 1.1.0
-Provides: bundled(crate(rustix)) = 0.36.8
 Provides: bundled(crate(same-file)) = 1.0.6
 Provides: bundled(crate(scopeguard)) = 1.1.0
-Provides: bundled(crate(signal-hook)) = 0.3.15
+Provides: bundled(crate(signal-hook)) = 0.3.14
 Provides: bundled(crate(signal-hook-mio)) = 0.2.3
-Provides: bundled(crate(signal-hook-registry)) = 1.4.1
+Provides: bundled(crate(signal-hook-registry)) = 1.4.0
 Provides: bundled(crate(smallvec)) = 1.10.0
 Provides: bundled(crate(strsim)) = 0.10.0
-Provides: bundled(crate(syn)) = 1.0.107
-Provides: bundled(crate(termcolor)) = 1.2.0
-Provides: bundled(crate(terminal_size)) = 0.2.5
-Provides: bundled(crate(textwrap)) = 0.16.0
+Provides: bundled(crate(syn)) = 1.0.95
+Provides: bundled(crate(termcolor)) = 1.1.3
+Provides: bundled(crate(terminal_size)) = 0.1.17
+Provides: bundled(crate(termtree)) = 0.2.4
+Provides: bundled(crate(textwrap)) = 0.15.0
 Provides: bundled(crate(tree-sitter)) = 0.20.9
 Provides: bundled(crate(tree_magic_mini)) = 3.0.3
-Provides: bundled(crate(typed-arena)) = 2.0.2
-Provides: bundled(crate(unicode-ident)) = 1.0.6
-Provides: bundled(crate(unicode-width)) = 0.1.10
-Provides: bundled(crate(unicode-xid)) = 0.2.4
+Provides: bundled(crate(typed-arena)) = 2.0.1
+Provides: bundled(crate(unicode-ident)) = 1.0.0
+Provides: bundled(crate(unicode-width)) = 0.1.9
+Provides: bundled(crate(unicode-xid)) = 0.2.3
 Provides: bundled(crate(version_check)) = 0.9.4
+Provides: bundled(crate(wait-timeout)) = 0.2.0
 Provides: bundled(crate(walkdir)) = 2.3.2
 Provides: bundled(crate(wasi)) = 0.11.0+wasi_snapshot_preview1
 Provides: bundled(crate(winapi)) = 0.3.9
 Provides: bundled(crate(winapi-i686-pc-windows-gnu)) = 0.4.0
 Provides: bundled(crate(winapi-util)) = 0.1.5
 Provides: bundled(crate(winapi-x86_64-pc-windows-gnu)) = 0.4.0
-Provides: bundled(crate(windows-sys)) = 0.45.0
-Provides: bundled(crate(windows-targets)) = 0.42.1
+Provides: bundled(crate(windows-sys)) = 0.42.0
 Provides: bundled(crate(windows_aarch64_gnullvm)) = 0.42.1
 Provides: bundled(crate(windows_aarch64_msvc)) = 0.42.1
 Provides: bundled(crate(windows_i686_gnu)) = 0.42.1
@@ -132,10 +140,9 @@ Provides: bundled(crate(windows_x86_64_gnu)) = 0.42.1
 Provides: bundled(crate(windows_x86_64_gnullvm)) = 0.42.1
 Provides: bundled(crate(windows_x86_64_msvc)) = 0.42.1
 Provides: bundled(crate(wu-diff)) = 0.1.2
-Provides: bundled(crate(yansi)) = 0.5.1
 
 %global _description %{expand:
-Structural diff that understands syntax.}
+A structural diff that understands syntax.}
 
 %description %{_description}
 
diff --git a/sources b/sources
index 8190068..1f7f0f2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (difftastic-0.43.1.crate) = 6e546cd8103539bb27a5521e9c71050b871827d10889bf71237555e4ab946af88559f0dc7df7f8b10f08a8dfa388baa8412596711d041d6d56b1ed0bb91887df
-SHA512 (difftastic-0.43.1-vendor.tar.xz) = 21eb6f970d1af76fa9c12775126f6fe3035fa0ba1a70073d2c59b98aeeea35ca62b25e00bff983d7a8d7f63f7827005109196d2e923ea25f1b4355a99f49a612
+SHA512 (difftastic-0.45.0.crate) = 97746ac4f2aa8be658b02e1223b039754473c56ab02ad5881eccb2b7868d2a7a2511998dbcf92901ec66857787aec88c8c29df5bba257cf378fa7ed5d855c2e2
+SHA512 (difftastic-0.45.0-vendor.tar.xz) = 19aea5cd7727a2e4871edfeaf3da299c8dae4d329913a85df8869cbc341e2778d4dd165f7b8fc59d586ba173375f106d97e636aaa1f448a71ab9261f094e6d50