From 2242ff96e670516019c1edcf54420034a4d2f7f5 Mon Sep 17 00:00:00 2001
From: Cameron Garnham <me@da2ce7.com>
Date: Sat, 24 Aug 2024 18:31:25 +0200
Subject: [PATCH] chore: update to v1 of derive more

---
 Cargo.lock                        | 28 ++++++++++++++++++----------
 Cargo.toml                        |  2 +-
 packages/configuration/Cargo.toml |  2 +-
 packages/configuration/src/lib.rs |  2 +-
 packages/primitives/Cargo.toml    |  2 +-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 04f25417..fdc2516f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -968,12 +968,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1189,15 +1183,23 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
  "syn 2.0.76",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -4260,6 +4262,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index e0774e23..44543e70 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ chrono = { version = "0", default-features = false, features = ["clock"] }
 clap = { version = "4", features = ["derive", "env"] }
 crossbeam-skiplist = "0"
 dashmap = "6"
-derive_more = "0"
+derive_more = { version = "1", features = ["constructor", "from","as_ref"] }
 figment = "0"
 futures = "0"
 futures-util = "0"
diff --git a/packages/configuration/Cargo.toml b/packages/configuration/Cargo.toml
index 0a4cfea2..4f217e1b 100644
--- a/packages/configuration/Cargo.toml
+++ b/packages/configuration/Cargo.toml
@@ -16,7 +16,7 @@ version.workspace = true
 
 [dependencies]
 camino = { version = "1", features = ["serde", "serde1"] }
-derive_more = "0"
+derive_more = { version = "1", features = ["constructor", "display"] }
 figment = { version = "0", features = ["env", "test", "toml"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["preserve_order"] }
diff --git a/packages/configuration/src/lib.rs b/packages/configuration/src/lib.rs
index bdbe419c..1ab3479f 100644
--- a/packages/configuration/src/lib.rs
+++ b/packages/configuration/src/lib.rs
@@ -51,7 +51,7 @@ pub const LATEST_VERSION: &str = "2.0.0";
 
 /// Info about the configuration specification.
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Display, Clone)]
-#[display(fmt = "Metadata(app: {app}, purpose: {purpose}, schema_version: {schema_version})")]
+#[display("Metadata(app: {app}, purpose: {purpose}, schema_version: {schema_version})")]
 pub struct Metadata {
     /// The application this configuration is valid for.
     #[serde(default = "Metadata::default_app")]
diff --git a/packages/primitives/Cargo.toml b/packages/primitives/Cargo.toml
index 05981b3a..3829a77a 100644
--- a/packages/primitives/Cargo.toml
+++ b/packages/primitives/Cargo.toml
@@ -17,7 +17,7 @@ version.workspace = true
 [dependencies]
 aquatic_udp_protocol = "0"
 binascii = "0"
-derive_more = "0"
+derive_more = {version = "1", features = ["constructor"]}
 serde = { version = "1", features = ["derive"] }
 tdyne-peer-id = "1"
 tdyne-peer-id-registry = "0"