Format payjoin-ffi

Enforce the same formatting rules as the rest of rust-payjoin. This was
done by removing the custom `rust-toolchain.toml` and `rustfmt.toml`
then applying the formatting with `cargo fmt`.

Author: spacebear21

payjoin-ffi/rust-toolchain.toml

@@ -7,9 +7,7 @@
 pub struct ImplementationError(#[from] payjoin::ImplementationError);
 
 impl From<String> for ImplementationError {
-    fn from(value: String) -> Self {
-        Self(value.into())
-    }
+    fn from(value: String) -> Self { Self(value.into()) }
 }
 
 #[derive(Debug, thiserror::Error)]

payjoin-ffi/rustfmt.toml

@@ -10,9 +10,7 @@ pub mod error {
         message: String,
     }
     impl From<payjoin::io::Error> for IoError {
-        fn from(value: payjoin::io::Error) -> Self {
-            IoError { message: format!("{value:?}") }
-        }
+        fn from(value: payjoin::io::Error) -> Self { IoError { message: format!("{value:?}") } }
     }
 }
 

payjoin-ffi/src/error.rs

@@ -8,26 +8,18 @@ pub mod error {
         message: String,
     }
     impl From<ohttp::Error> for OhttpError {
-        fn from(value: ohttp::Error) -> Self {
-            OhttpError { message: format!("{value:?}") }
-        }
+        fn from(value: ohttp::Error) -> Self { OhttpError { message: format!("{value:?}") } }
     }
     impl From<String> for OhttpError {
-        fn from(value: String) -> Self {
-            OhttpError { message: value }
-        }
+        fn from(value: String) -> Self { OhttpError { message: value } }
     }
 }
 
 impl From<payjoin::OhttpKeys> for OhttpKeys {
-    fn from(value: payjoin::OhttpKeys) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::OhttpKeys) -> Self { Self(value) }
 }
 impl From<OhttpKeys> for payjoin::OhttpKeys {
-    fn from(value: OhttpKeys) -> Self {
-        value.0
-    }
+    fn from(value: OhttpKeys) -> Self { value.0 }
 }
 #[cfg_attr(feature = "uniffi", derive(uniffi::Object))]
 #[derive(Debug, Clone)]
@@ -64,7 +56,5 @@ impl From<&ClientResponse> for ohttp::ClientResponse {
 }
 
 impl From<ohttp::ClientResponse> for ClientResponse {
-    fn from(value: ohttp::ClientResponse) -> Self {
-        Self(Mutex::new(Some(value)))
-    }
+    fn from(value: ohttp::ClientResponse) -> Self { Self(Mutex::new(Some(value))) }
 }

payjoin-ffi/src/io.rs

@@ -56,15 +56,11 @@ pub struct ReplyableError(#[from] receive::ReplyableError);
 pub struct JsonReply(receive::JsonReply);
 
 impl From<JsonReply> for receive::JsonReply {
-    fn from(value: JsonReply) -> Self {
-        value.0
-    }
+    fn from(value: JsonReply) -> Self { value.0 }
 }
 
 impl From<ReplyableError> for JsonReply {
-    fn from(value: ReplyableError) -> Self {
-        Self(value.0.into())
-    }
+    fn from(value: ReplyableError) -> Self { Self(value.0.into()) }
 }
 
 /// Error that may occur during a v2 session typestate change

payjoin-ffi/src/ohttp.rs

@@ -24,15 +24,11 @@ pub mod uni;
 pub struct NewReceiver(payjoin::receive::v2::NewReceiver);
 
 impl From<NewReceiver> for payjoin::receive::v2::NewReceiver {
-    fn from(value: NewReceiver) -> Self {
-        value.0
-    }
+    fn from(value: NewReceiver) -> Self { value.0 }
 }
 
 impl From<payjoin::receive::v2::NewReceiver> for NewReceiver {
-    fn from(value: payjoin::receive::v2::NewReceiver) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::NewReceiver) -> Self { Self(value) }
 }
 
 impl NewReceiver {
@@ -78,15 +74,11 @@ impl NewReceiver {
 pub struct Receiver(payjoin::receive::v2::Receiver);
 
 impl From<Receiver> for payjoin::receive::v2::Receiver {
-    fn from(value: Receiver) -> Self {
-        value.0
-    }
+    fn from(value: Receiver) -> Self { value.0 }
 }
 
 impl From<payjoin::receive::v2::Receiver> for Receiver {
-    fn from(value: payjoin::receive::v2::Receiver) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::Receiver) -> Self { Self(value) }
 }
 
 impl Receiver {
@@ -138,24 +130,18 @@ impl Receiver {
             .map(Into::into)
     }
 
-    pub fn key(&self) -> ReceiverToken {
-        self.0.key()
-    }
+    pub fn key(&self) -> ReceiverToken { self.0.key() }
 }
 
 #[derive(Clone)]
 pub struct UncheckedProposal(payjoin::receive::v2::UncheckedProposal);
 
 impl From<payjoin::receive::v2::UncheckedProposal> for UncheckedProposal {
-    fn from(value: payjoin::receive::v2::UncheckedProposal) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::UncheckedProposal) -> Self { Self(value) }
 }
 
 impl From<UncheckedProposal> for payjoin::receive::v2::UncheckedProposal {
-    fn from(value: UncheckedProposal) -> Self {
-        value.0
-    }
+    fn from(value: UncheckedProposal) -> Self { value.0 }
 }
 
 impl UncheckedProposal {
@@ -220,9 +206,7 @@ impl UncheckedProposal {
 pub struct MaybeInputsOwned(payjoin::receive::v2::MaybeInputsOwned);
 
 impl From<payjoin::receive::v2::MaybeInputsOwned> for MaybeInputsOwned {
-    fn from(value: payjoin::receive::v2::MaybeInputsOwned) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::MaybeInputsOwned) -> Self { Self(value) }
 }
 
 impl MaybeInputsOwned {
@@ -242,9 +226,7 @@ impl MaybeInputsOwned {
 pub struct MaybeInputsSeen(payjoin::receive::v2::MaybeInputsSeen);
 
 impl From<payjoin::receive::v2::MaybeInputsSeen> for MaybeInputsSeen {
-    fn from(value: payjoin::receive::v2::MaybeInputsSeen) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::MaybeInputsSeen) -> Self { Self(value) }
 }
 
 impl MaybeInputsSeen {
@@ -268,9 +250,7 @@ impl MaybeInputsSeen {
 pub struct OutputsUnknown(payjoin::receive::v2::OutputsUnknown);
 
 impl From<payjoin::receive::v2::OutputsUnknown> for OutputsUnknown {
-    fn from(value: payjoin::receive::v2::OutputsUnknown) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::OutputsUnknown) -> Self { Self(value) }
 }
 
 impl OutputsUnknown {
@@ -290,15 +270,11 @@ impl OutputsUnknown {
 pub struct WantsOutputs(payjoin::receive::v2::WantsOutputs);
 
 impl From<payjoin::receive::v2::WantsOutputs> for WantsOutputs {
-    fn from(value: payjoin::receive::v2::WantsOutputs) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::WantsOutputs) -> Self { Self(value) }
 }
 
 impl WantsOutputs {
-    pub fn output_substitution(&self) -> OutputSubstitution {
-        self.0.output_substitution()
-    }
+    pub fn output_substitution(&self) -> OutputSubstitution { self.0.output_substitution() }
 
     pub fn replace_receiver_outputs(
         &self,
@@ -325,17 +301,13 @@ impl WantsOutputs {
             .map_err(Into::into)
     }
 
-    pub fn commit_outputs(&self) -> WantsInputs {
-        self.0.clone().commit_outputs().into()
-    }
+    pub fn commit_outputs(&self) -> WantsInputs { self.0.clone().commit_outputs().into() }
 }
 
 pub struct WantsInputs(payjoin::receive::v2::WantsInputs);
 
 impl From<payjoin::receive::v2::WantsInputs> for WantsInputs {
-    fn from(value: payjoin::receive::v2::WantsInputs) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::WantsInputs) -> Self { Self(value) }
 }
 impl WantsInputs {
     /// Select receiver input such that the payjoin avoids surveillance.
@@ -370,9 +342,7 @@ impl WantsInputs {
             .map_err(Into::into)
     }
 
-    pub fn commit_inputs(&self) -> ProvisionalProposal {
-        self.0.clone().commit_inputs().into()
-    }
+    pub fn commit_inputs(&self) -> ProvisionalProposal { self.0.clone().commit_inputs().into() }
 }
 
 #[derive(Debug, Clone)]
@@ -391,23 +361,17 @@ impl InputPair {
 }
 
 impl From<InputPair> for payjoin::receive::InputPair {
-    fn from(value: InputPair) -> Self {
-        value.0
-    }
+    fn from(value: InputPair) -> Self { value.0 }
 }
 
 impl From<payjoin::receive::InputPair> for InputPair {
-    fn from(value: payjoin::receive::InputPair) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::InputPair) -> Self { Self(value) }
 }
 
 pub struct ProvisionalProposal(pub payjoin::receive::v2::ProvisionalProposal);
 
 impl From<payjoin::receive::v2::ProvisionalProposal> for ProvisionalProposal {
-    fn from(value: payjoin::receive::v2::ProvisionalProposal) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::ProvisionalProposal) -> Self { Self(value) }
 }
 
 impl ProvisionalProposal {
@@ -436,15 +400,11 @@ impl ProvisionalProposal {
 pub struct PayjoinProposal(pub payjoin::receive::v2::PayjoinProposal);
 
 impl From<PayjoinProposal> for payjoin::receive::v2::PayjoinProposal {
-    fn from(value: PayjoinProposal) -> Self {
-        value.0
-    }
+    fn from(value: PayjoinProposal) -> Self { value.0 }
 }
 
 impl From<payjoin::receive::v2::PayjoinProposal> for PayjoinProposal {
-    fn from(value: payjoin::receive::v2::PayjoinProposal) -> Self {
-        Self(value)
-    }
+    fn from(value: payjoin::receive::v2::PayjoinProposal) -> Self { Self(value) }
 }
 
 impl PayjoinProposal {