Misc rustfmt change

Maybe rustfmt nightly changed something. But it looks like both versions are accepted by --check check
rust-bitcoin · Jun 6, 2022 · 2e9bd32 · 2e9bd32
1 parent acbef2f
commit 2e9bd32
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 29 deletions.
diff --git a/src/interpreter/error.rs b/src/interpreter/error.rs
@@ -145,22 +145,18 @@ impl fmt::Display for Error {
             }
             Error::IncorrectWScriptHash => f.write_str("witness script did not match scriptpubkey"),
             Error::InsufficientSignaturesMultiSig => f.write_str("Insufficient signatures for CMS"),
-            Error::InvalidSchnorrSighashType(ref sig) => {
-                write!(
-                    f,
-                    "Invalid sighash type for schnorr signature '{}'",
-                    sig.to_hex()
-                )
-            }
+            Error::InvalidSchnorrSighashType(ref sig) => write!(
+                f,
+                "Invalid sighash type for schnorr signature '{}'",
+                sig.to_hex()
+            ),
             Error::InvalidEcdsaSignature(pk) => write!(f, "bad ecdsa signature with pk {}", pk),
             Error::InvalidSchnorrSignature(pk) => write!(f, "bad schnorr signature with pk {}", pk),
-            Error::NonStandardSighash(ref sig) => {
-                write!(
-                    f,
-                    "Non standard sighash type for signature '{}'",
-                    sig.to_hex()
-                )
-            }
+            Error::NonStandardSighash(ref sig) => write!(
+                f,
+                "Non standard sighash type for signature '{}'",
+                sig.to_hex()
+            ),
             Error::NonEmptyWitness => f.write_str("legacy spend had nonempty witness"),
             Error::NonEmptyScriptSig => f.write_str("segwit spend had nonempty scriptsig"),
             Error::Miniscript(ref e) => write!(f, "parse error: {}", e),

diff --git a/src/lib.rs b/src/lib.rs
@@ -661,18 +661,10 @@ impl fmt::Display for Error {
             Error::PubKeyCtxError(ref pk, ref ctx) => {
                 write!(f, "Pubkey error: {} under {} scriptcontext", pk, ctx)
             }
-            Error::MultiATooManyKeys(k) => {
-                write!(f, "MultiA too many keys {}", k)
-            }
-            Error::TaprootSpendInfoUnavialable => {
-                write!(f, "Taproot Spend Info not computed.")
-            }
-            Error::TrNoScriptCode => {
-                write!(f, "No script code for Tr descriptors")
-            }
-            Error::TrNoExplicitScript => {
-                write!(f, "No script code for Tr descriptors")
-            }
+            Error::MultiATooManyKeys(k) => write!(f, "MultiA too many keys {}", k),
+            Error::TaprootSpendInfoUnavialable => write!(f, "Taproot Spend Info not computed."),
+            Error::TrNoScriptCode => write!(f, "No script code for Tr descriptors"),
+            Error::TrNoExplicitScript => write!(f, "No script code for Tr descriptors"),
         }
     }
 }

diff --git a/src/psbt/mod.rs b/src/psbt/mod.rs
@@ -238,9 +238,7 @@ impl fmt::Display for InputError {
                  sighashflag {:?} rather than required {:?}",
                 pubkey, got, required
             ),
-            InputError::CouldNotSatisfyTr => {
-                write!(f, "Could not satisfy Tr descriptor")
-            }
+            InputError::CouldNotSatisfyTr => write!(f, "Could not satisfy Tr descriptor"),
             InputError::NonStandardSighashType(e) => write!(f, "Non-standard sighash type {}", e),
         }
     }