code: Update to derive_more 1.0

Cargo.toml

@@ -30,7 +30,7 @@ color-eyre = "0.6.0"
 console = "0.15.0"
 crypto_secretbox = "0.1.1"
 ctrlc = "3.2.1"
-derive_more = { version = "0.99.0", default-features = false }
+derive_more = { version = "1.0", default-features = false }
 dialoguer = "0.11"
 env_logger = "0.11"
 eyre = "0.6.5"

src/core.rs

@@ -637,7 +637,7 @@ impl AsRef<str> for AppID {
     PartialEq, Eq, Clone, Debug, Deserialize, Serialize, derive_more::Display, derive_more::Deref,
 )]
 #[serde(transparent)]
-#[display(fmt = "MySide({})", "&*_0")]
+#[display("MySide({})", "&*_0")]
 #[deprecated(
     since = "0.7.0",
     note = "This will be a private type in the future. Open an issue if you require access to protocol intrinsics in the future"
@@ -667,7 +667,7 @@ impl MySide {
     PartialEq, Eq, Clone, Debug, Deserialize, Serialize, derive_more::Display, derive_more::Deref,
 )]
 #[serde(transparent)]
-#[display(fmt = "TheirSide({})", "&*_0")]
+#[display("TheirSide({})", "&*_0")]
 #[deprecated(
     since = "0.7.0",
     note = "This will be a private type in the future. Open an issue if you require access to protocol intrinsics in the future"
@@ -685,7 +685,7 @@ impl<S: Into<String>> From<S> for TheirSide {
 )]
 #[serde(transparent)]
 #[deref(forward)]
-#[display(fmt = "{}", "&*_0")]
+#[display("{}", "&*_0")]
 #[deprecated(
     since = "0.7.0",
     note = "This will be a private type in the future. Open an issue if you require access to protocol intrinsics in the future"
@@ -750,7 +750,7 @@ pub struct Mailbox(pub String);
 )]
 #[serde(transparent)]
 #[deref(forward)]
-#[display(fmt = "{}", _0)]
+#[display("{}", _0)]
 pub struct Nameplate(
     #[deprecated(since = "0.7.0", note = "use the AsRef<str> implementation")] pub String,
 );
@@ -791,7 +791,7 @@ impl AsRef<str> for Nameplate {
  * a wordlist is a common convention.
  */
 #[derive(PartialEq, Eq, Clone, Debug, derive_more::Display, derive_more::Deref)]
-#[display(fmt = "{}", _0)]
+#[display("{}", _0)]
 pub struct Code(
     #[deprecated(since = "0.7.0", note = "use the AsRef<str> implementation")] pub String,
 );

src/core/key.rs

@@ -34,7 +34,7 @@ impl KeyPurpose for GenericKey {}
  * You don't need to do any crypto, but you might need it to derive subkeys for sub-protocols.
  */
 #[derive(Debug, Clone, derive_more::Display, derive_more::Deref)]
-#[display(fmt = "{:?}", _0)]
+#[display("{:?}", _0)]
 #[deref(forward)]
 pub struct Key<P: KeyPurpose>(
     #[deref]

src/core/rendezvous.rs

@@ -79,7 +79,7 @@ impl RendezvousError {
 type MessageQueue = VecDeque<EncryptedMessage>;
 
 #[derive(Clone, Debug, derive_more::Display)]
-#[display(fmt = "{:?}", _0)]
+#[display("{:?}", _0)]
 struct NameplateList(Vec<Nameplate>);
 
 #[cfg(not(target_family = "wasm"))]
@@ -289,7 +289,7 @@ enum RendezvousReply {
 
 #[derive(Clone, Debug, derive_more::Display)]
 #[display(
-    fmt = "MailboxMachine {{ mailbox: {}, processed: [{}] }}",
+    "MailboxMachine {{ mailbox: {}, processed: [{}] }}",
     mailbox,
     "processed.iter().map(|p| format!(\"{}\", p)).collect::<Vec<String>>().join(\", \")"
 )]

src/core/server_messages.rs

@@ -32,7 +32,7 @@ impl Nameplate_ {
 #[serde(rename_all = "kebab-case")]
 #[serde(tag = "method")]
 pub enum SubmitPermission {
-    #[display(fmt = "Hashcash {{ stamp: '{}' }}", stamp)]
+    #[display("Hashcash {{ stamp: '{}' }}", stamp)]
     Hashcash { stamp: String },
 }
 
@@ -95,11 +95,7 @@ impl std::fmt::Display for PermissionRequired {
 }
 
 #[derive(Deserialize, Debug, PartialEq, Eq, derive_more::Display)]
-#[display(
-    fmt = "HashcashPermission {{ bits: {}, resource: '{}' }}",
-    bits,
-    resource
-)]
+#[display("HashcashPermission {{ bits: {}, resource: '{}' }}", bits, resource)]
 #[serde(deny_unknown_fields)]
 pub struct HashcashPermission {
     pub bits: u32,
@@ -108,7 +104,7 @@ pub struct HashcashPermission {
 
 #[derive(Debug, PartialEq, Clone, Deserialize, derive_more::Display)]
 #[display(
-    fmt = "EncryptedMessage {{ side: {}, phase: {}, body: {}",
+    "EncryptedMessage {{ side: {}, phase: {}, body: {}",
     side,
     phase,
     "crate::util::DisplayBytes(body)"
@@ -134,29 +130,29 @@ impl EncryptedMessage {
 #[serde(tag = "type")]
 #[allow(dead_code)]
 pub enum OutboundMessage {
-    #[display(fmt = "SubmitPermission({})", _0)]
+    #[display("SubmitPermission({})", _0)]
     SubmitPermission(SubmitPermission),
-    #[display(fmt = "Bind {{ appid: {}, side: {} }}", appid, side)]
+    #[display("Bind {{ appid: {}, side: {} }}", appid, side)]
     Bind {
         appid: AppID,
         side: MySide,
     },
     List,
     Allocate,
-    #[display(fmt = "Claim({})", nameplate)]
+    #[display("Claim({})", nameplate)]
     Claim {
         nameplate: String,
     },
-    #[display(fmt = "Release({})", nameplate)]
+    #[display("Release({})", nameplate)]
     Release {
         nameplate: String,
     }, // TODO: nominally optional
-    #[display(fmt = "Open({})", mailbox)]
+    #[display("Open({})", mailbox)]
     Open {
         mailbox: Mailbox,
     },
     #[display(
-        fmt = "Add {{ phase: {}, body: {} }}",
+        "Add {{ phase: {}, body: {} }}",
         phase,
         "crate::util::DisplayBytes(body)"
     )]
@@ -165,12 +161,12 @@ pub enum OutboundMessage {
         #[serde(serialize_with = "hex::serde::serialize")]
         body: Vec<u8>,
     },
-    #[display(fmt = "Close {{ mailbox: {}, mood: {} }}", mailbox, mood)]
+    #[display("Close {{ mailbox: {}, mood: {} }}", mailbox, mood)]
     Close {
         mailbox: Mailbox,
         mood: Mood,
     },
-    #[display(fmt = "Ping({})", ping)]
+    #[display("Ping({})", ping)]
     Ping {
         ping: u64,
     },
@@ -212,38 +208,38 @@ impl OutboundMessage {
 #[serde(rename_all = "kebab-case")]
 #[serde(tag = "type")]
 pub enum InboundMessage {
-    #[display(fmt = "Welcome({})", welcome)]
+    #[display("Welcome({})", welcome)]
     Welcome {
         welcome: WelcomeMessage,
     },
-    #[display(fmt = "Nameplates({:?})", nameplates)]
+    #[display("Nameplates({:?})", nameplates)]
     Nameplates {
         #[serde(with = "Nameplate_")]
         nameplates: Vec<Nameplate>,
     },
-    #[display(fmt = "Allocated({})", nameplate)]
+    #[display("Allocated({})", nameplate)]
     Allocated {
         nameplate: Nameplate,
     },
-    #[display(fmt = "Claimed({})", mailbox)]
+    #[display("Claimed({})", mailbox)]
     Claimed {
         mailbox: Mailbox,
     },
     Released,
     #[display(
-        fmt = "Message {{ side: {}, phase: {:?}, body: {} }}",
+        "Message {{ side: {}, phase: {:?}, body: {} }}",
         _0.side,
         _0.phase,
         "crate::util::DisplayBytes(_0.body.as_bytes())"
     )]
     Message(EncryptedMessage),
     Closed,
     Ack,
-    #[display(fmt = "Pong({})", pong)]
+    #[display("Pong({})", pong)]
     Pong {
         pong: u64,
     },
-    #[display(fmt = "Error {{ error: {:?}, .. }}", error)]
+    #[display("Error {{ error: {:?}, .. }}", error)]
     Error {
         error: String,
         /// A copy of the original message that caused the error.

src/transfer.rs

@@ -244,28 +244,28 @@ impl Default for AppVersionTransferV2Hint {
 pub enum PeerMessage {
     /* V1 */
     /// A transit message
-    #[display(fmt = "transit")]
+    #[display("transit")]
     Transit(v1::TransitV1),
 
     /// An offer message
-    #[display(fmt = "offer")]
+    #[display("offer")]
     Offer(v1::OfferMessage),
 
     /// An answer message
-    #[display(fmt = "answer")]
+    #[display("answer")]
     Answer(v1::AnswerMessage),
     /* V2 */
     /// A transit v2 message
     #[cfg(feature = "experimental-transfer-v2")]
-    #[display(fmt = "transit-v2")]
+    #[display("transit-v2")]
     TransitV2(v2::TransitV2),
 
     /// Tell the other side you got an error
-    #[display(fmt = "error")]
+    #[display("error")]
     Error(String),
 
     /// An unknown message
-    #[display(fmt = "unknown")]
+    #[display("unknown")]
     #[serde(other)]
     Unknown,
 }

src/transfer/v2.rs

@@ -20,21 +20,21 @@ pub struct TransitV2 {
 #[serde(rename_all = "kebab-case")]
 #[non_exhaustive]
 pub enum PeerMessageV2 {
-    #[display(fmt = "offer")]
+    #[display("offer")]
     Offer(Offer),
-    #[display(fmt = "answer")]
+    #[display("answer")]
     Answer(AnswerMessage),
-    #[display(fmt = "file-start")]
+    #[display("file-start")]
     FileStart(FileStart),
-    #[display(fmt = "payload")]
+    #[display("payload")]
     Payload(Payload),
-    #[display(fmt = "file-end")]
+    #[display("file-end")]
     FileEnd(FileEnd),
-    #[display(fmt = "transfer-ack")]
+    #[display("transfer-ack")]
     TransferAck(TransferAck),
-    #[display(fmt = "error")]
+    #[display("error")]
     Error(String),
-    #[display(fmt = "unknown")]
+    #[display("unknown")]
     #[serde(other)]
     Unknown,
 }

src/transit.rs

@@ -377,7 +377,7 @@ impl serde::Serialize for Hints {
 
 /** hostname and port for direct connection */
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Hash, derive_more::Display)]
-#[display(fmt = "tcp://{}:{}", hostname, port)]
+#[display("tcp://{}:{}", hostname, port)]
 pub struct DirectHint {
     // DirectHint also contains a `priority` field, but it is underspecified
     // and we won't use it