From 6e2e788a614eb1e15abe414035b49f14a7fc1982 Mon Sep 17 00:00:00 2001
From: Lynnesbian <lynne@bune.city>
Date: Wed, 18 Aug 2021 23:42:44 +1000
Subject: [PATCH] oh jeez oh man v0.3.6

---
 CHANGELOG.md | 11 +++++++++--
 Cargo.lock   | 10 +++++-----
 Cargo.toml   |  7 ++++++-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd47ba..1945d6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,18 @@
 Dates are given in YYYY-MM-DD format.
 
 ## v0.3
-### v0.3.5 (2021-08-16)
+### v0.3.6 (2021-08-16)
+#### Other
+- Fixed another major dependency issue - [`clap`] version 3 beta 2 pulls in `clap_derive` version 3 beta **4**, causing
+fif to fail to build unless you use `--locked`. `Cargo.toml` now explicitly depends on `clap_derive` v3b2, which should
+fix this in (hopefully) all cases...
+- Added an explicit dependency on `bitflags` 1.2.1, as 1.3+ requires Rust >= 1.46
+
+### v0.3.5 (2021-08-16) [YANKED]
 #### Other
 - Updated `Cargo.toml` to pin [`clap`] to version 3 beta 2 - previously, version 3 beta 4 was considered compatible and
 would be used if you ran `cargo install fif` instead of `cargo install --locked fif`, however, fif does *not* work with
-this version of clap, which caused the build to fail. Also, clap 3 beta 4 depends on Rust >= 1.54, breaking our MSRV
+this version of `clap`, which caused the build to fail. Also, `clap` 3 beta 4 depends on Rust >= 1.54, breaking our MSRV
 - Fixed a few other `Cargo.toml` dependency versions that were causing issues when building on MSRV
 
 ### v0.3.4 (2021-08-07)
diff --git a/Cargo.lock b/Cargo.lock
index 255255d..c382a99 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -185,11 +183,13 @@ checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193"
 
 [[package]]
 name = "fif"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
+ "bitflags",
  "cached",
  "cfg-if",
  "clap",
+ "clap_derive",
  "env_logger",
  "exitcode",
  "infer",
@@ -326,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
diff --git a/Cargo.toml b/Cargo.toml
index 5cebc07..5909ea9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fif"
 description = "A command-line tool for detecting and optionally correcting files with incorrect extensions."
-version = "0.3.5"
+version = "0.3.6"
 authors = ["Lynnesbian <lynne@bune.city>"]
 edition = "2018"
 license = "GPL-3.0-or-later"
@@ -37,6 +37,7 @@ cfg-if = "1.0.0"
 itertools = "0.10.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
 serde_json = { version = "1.0", optional = true }
+bitflags = "~1.2.1" # 1.3+ requires Rust >= 1.46
 
 [target.'cfg(not(unix))'.dependencies]
 xdg-mime = { version = "0.3.3", optional = true }
@@ -65,6 +66,10 @@ version = "=3.0.0-beta.2"
 default-features = false
 features = ["wrap_help", "color", "derive", "std"]
 
+[dependencies.clap_derive]
+# without this, clap beta.2 will install clap_derive beta.4 :c
+version = "=3.0.0-beta.2"
+
 [dependencies.env_logger]
 version = "0.9.0"
 default-features = false