From ae83e45b3c88d8ae687f3147b492f6494d0cd883 Mon Sep 17 00:00:00 2001
From: Christopher Schwan <handgranaten-herbert@posteo.de>
Date: Fri, 26 Jan 2024 14:03:11 +0100
Subject: [PATCH] Update `predicates` and `bitflags` dependencies

---
 Cargo.lock              | 25 +++++++------------------
 pineappl/Cargo.toml     |  2 +-
 pineappl_cli/Cargo.toml |  2 +-
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c6ef1db9..bfcf1fcb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -87,7 +87,7 @@ dependencies = [
  "anstyle",
  "bstr",
  "doc-comment",
- "predicates 3.1.0",
+ "predicates",
  "predicates-core",
  "predicates-tree",
  "wait-timeout",
@@ -102,7 +102,7 @@ dependencies = [
  "anstyle",
  "doc-comment",
  "globwalk",
- "predicates 3.1.0",
+ "predicates",
  "predicates-core",
  "predicates-tree",
  "tempfile",
@@ -924,7 +924,7 @@ dependencies = [
  "anyhow",
  "arrayvec",
  "bincode",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "enum_dispatch",
  "float-cmp",
  "git-version",
@@ -984,7 +984,7 @@ dependencies = [
  "pineappl",
  "pineappl_applgrid",
  "pineappl_fastnlo",
- "predicates 2.1.5",
+ "predicates",
  "prettytable-rs",
  "rayon",
  "serde",
@@ -1018,20 +1018,6 @@ version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
 
-[[package]]
-name = "predicates"
-version = "2.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
-dependencies = [
- "difflib",
- "float-cmp",
- "itertools",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
 [[package]]
 name = "predicates"
 version = "3.1.0"
@@ -1040,7 +1026,10 @@ checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
 dependencies = [
  "anstyle",
  "difflib",
+ "float-cmp",
+ "normalize-line-endings",
  "predicates-core",
+ "regex",
 ]
 
 [[package]]
diff --git a/pineappl/Cargo.toml b/pineappl/Cargo.toml
index 0880ac60..d4358d64 100644
--- a/pineappl/Cargo.toml
+++ b/pineappl/Cargo.toml
@@ -15,7 +15,7 @@ version.workspace = true
 [dependencies]
 arrayvec = "0.7.2"
 bincode = "1.3.3"
-bitflags = "1.3.2"
+bitflags = "2.4.2"
 enum_dispatch = "0.3.7"
 float-cmp = "0.9.0"
 git-version = "0.3.5"
diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml
index 151253a7..2b73bfd7 100644
--- a/pineappl_cli/Cargo.toml
+++ b/pineappl_cli/Cargo.toml
@@ -39,7 +39,7 @@ tar = { optional = true, version = "0.4.38" }
 [dev-dependencies]
 assert_cmd = "2.0.2"
 assert_fs = "1.0.6"
-predicates = "2.1.1"
+predicates = "3.1.0"
 
 [[bin]]
 name = "pineappl"