From 3cc10c726b1d1cbb4185193d756febe19a0c8e09 Mon Sep 17 00:00:00 2001
From: Thomas Churchman <thomas@kepow.org>
Date: Wed, 30 Aug 2023 15:13:57 +0200
Subject: [PATCH] Revert "Downgrade Clap to support rustc 1.69"

Instead bump rustc used for compiling production.
---
 Cargo.lock                | 32 ++++++++++----------------------
 astroplant-api/Cargo.toml |  3 +--
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7e94fca..d8ef0da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -86,16 +86,15 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is-terminal",
  "utf8parse",
 ]
 
@@ -125,9 +124,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -575,9 +574,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.3.24"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487"
+checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -586,9 +585,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.3.24"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e"
+checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -598,9 +597,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.3.12"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
+checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -1489,17 +1488,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys",
-]
-
 [[package]]
 name = "itertools"
 version = "0.9.0"
diff --git a/astroplant-api/Cargo.toml b/astroplant-api/Cargo.toml
index 0d76166..eaa5a16 100644
--- a/astroplant-api/Cargo.toml
+++ b/astroplant-api/Cargo.toml
@@ -16,8 +16,7 @@ axum = { version = "0.5", features = ["headers", "ws"] }
 bigdecimal = "0.4.0"
 bytes = "1"
 chrono = { version = "0.4", features = ["serde"] }
-# Support rustc 1.69
-clap = { version ="4.3.24, <4.4", features = ["derive"] }
+clap = { version ="4.3", features = ["derive"] }
 deadpool-diesel = { version = "0.4.1", features = ["postgres"] }
 diesel = { version = "2.1.0", features = ["postgres", "numeric", "chrono", "serde_json", "uuid"] }
 diesel_migrations = "2.1.0"