From 9db6f494c24a665c0a3f6b8418a00b3efcd70756 Mon Sep 17 00:00:00 2001
From: John Smith <jsmithveilid@protonmail.com>
Date: Mon, 29 May 2023 17:25:16 -0400
Subject: [PATCH] cursive update from upstream

---
 Cargo.lock       | 50 ++++++++++++++++++++++++++++++++++++++++++------
 external/cursive |  2 +-
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b4a7813..8c855857 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1152,7 +1152,7 @@ dependencies = [
  "rust-ini",
  "serde",
  "serde_json",
- "toml",
+ "toml 0.5.11",
  "yaml-rust",
 ]
 
@@ -1356,9 +1356,9 @@ dependencies = [
 
 [[package]]
 name = "crossterm"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
 dependencies = [
  "bitflags 1.3.2",
  "crossterm_winapi",
@@ -1448,6 +1448,15 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "cursive-macros"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "cursive_buffered_backend"
 version = "0.6.1-pre"
@@ -1462,21 +1471,24 @@ dependencies = [
 
 [[package]]
 name = "cursive_core"
-version = "0.3.5"
+version = "0.3.7"
 dependencies = [
  "ahash 0.8.3",
  "ansi-parser",
  "async-std",
  "crossbeam-channel",
+ "cursive-macros",
  "enum-map",
  "enumset",
  "lazy_static",
  "log",
  "num",
  "owning_ref",
+ "serde_json",
+ "serde_yaml",
  "time 0.3.21",
  "tokio 1.28.2",
- "toml",
+ "toml 0.7.4",
  "unicode-segmentation",
  "unicode-width",
  "xi-unicode",
@@ -4080,7 +4092,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
 dependencies = [
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -4851,6 +4863,15 @@ dependencies = [
  "syn 2.0.18",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_yaml"
 version = "0.9.21"
@@ -5567,11 +5588,26 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_edit"
@@ -5580,6 +5616,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
 dependencies = [
  "indexmap",
+ "serde",
+ "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
diff --git a/external/cursive b/external/cursive
index f1504cf3..31ea07fd 160000
--- a/external/cursive
+++ b/external/cursive
@@ -1 +1 @@
-Subproject commit f1504cf37a7021454020cda5cfba815755399794
+Subproject commit 31ea07fde2191be2ff8eb7c46c6fc2a1bfd8e311