diff --git a/radix-common/src/types/addresses/component_address.rs b/radix-common/src/types/addresses/component_address.rs index 7cb89ff717..5e9aff917d 100644 --- a/radix-common/src/types/addresses/component_address.rs +++ b/radix-common/src/types/addresses/component_address.rs @@ -291,9 +291,9 @@ impl fmt::Debug for ComponentAddress { impl<'a> ContextualDisplay> for ComponentAddress { type Error = AddressBech32EncodeError; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { if let Some(encoder) = context.encoder { diff --git a/radix-common/src/types/addresses/global_address.rs b/radix-common/src/types/addresses/global_address.rs index 1cf38d2e3e..17867eebe8 100644 --- a/radix-common/src/types/addresses/global_address.rs +++ b/radix-common/src/types/addresses/global_address.rs @@ -241,9 +241,9 @@ impl fmt::Debug for GlobalAddress { impl<'a> ContextualDisplay> for GlobalAddress { type Error = AddressBech32EncodeError; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { if let Some(encoder) = context.encoder { diff --git a/radix-common/src/types/addresses/internal_address.rs b/radix-common/src/types/addresses/internal_address.rs index 1a6f92d897..4aa3aec4c0 100644 --- a/radix-common/src/types/addresses/internal_address.rs +++ b/radix-common/src/types/addresses/internal_address.rs @@ -231,9 +231,9 @@ impl fmt::Debug for InternalAddress { impl<'a> ContextualDisplay> for InternalAddress { type Error = AddressBech32EncodeError; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { if let Some(encoder) = context.encoder { diff --git a/radix-common/src/types/addresses/package_address.rs b/radix-common/src/types/addresses/package_address.rs index dffb24138d..fb4d30c7c0 100644 --- a/radix-common/src/types/addresses/package_address.rs +++ b/radix-common/src/types/addresses/package_address.rs @@ -255,9 +255,9 @@ impl fmt::Debug for PackageAddress { impl<'a> ContextualDisplay> for PackageAddress { type Error = AddressBech32EncodeError; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { if let Some(encoder) = context.encoder { diff --git a/radix-common/src/types/addresses/resource_address.rs b/radix-common/src/types/addresses/resource_address.rs index e1a888e5fd..535a6046a5 100644 --- a/radix-common/src/types/addresses/resource_address.rs +++ b/radix-common/src/types/addresses/resource_address.rs @@ -248,9 +248,9 @@ impl fmt::Debug for ResourceAddress { impl<'a> ContextualDisplay> for ResourceAddress { type Error = AddressBech32EncodeError; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { if let Some(encoder) = context.encoder { diff --git a/radix-common/src/types/blueprint_id.rs b/radix-common/src/types/blueprint_id.rs index 2af9eeb29a..3b377239d8 100644 --- a/radix-common/src/types/blueprint_id.rs +++ b/radix-common/src/types/blueprint_id.rs @@ -27,9 +27,9 @@ impl BlueprintId { impl<'a> ContextualDisplay> for BlueprintId { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { write!( diff --git a/radix-common/src/types/node_and_substate.rs b/radix-common/src/types/node_and_substate.rs index 1c8eebf5ce..2dd3a02f03 100644 --- a/radix-common/src/types/node_and_substate.rs +++ b/radix-common/src/types/node_and_substate.rs @@ -203,9 +203,9 @@ impl Debug for NodeId { impl<'a> ContextualDisplay> for NodeId { type Error = AddressBech32EncodeError; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { if let Some(encoder) = context.encoder { diff --git a/radix-common/src/types/non_fungible_global_id.rs b/radix-common/src/types/non_fungible_global_id.rs index f0a3f89cf2..3b50d73ab2 100644 --- a/radix-common/src/types/non_fungible_global_id.rs +++ b/radix-common/src/types/non_fungible_global_id.rs @@ -155,9 +155,9 @@ impl fmt::Display for ParseNonFungibleGlobalIdError { impl<'a> ContextualDisplay> for NonFungibleGlobalId { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { write!( diff --git a/radix-engine-interface/src/types/event_id.rs b/radix-engine-interface/src/types/event_id.rs index ea3cb52a69..4c299ee15e 100644 --- a/radix-engine-interface/src/types/event_id.rs +++ b/radix-engine-interface/src/types/event_id.rs @@ -27,9 +27,9 @@ pub enum Emitter { impl<'a> ContextualDisplay> for Emitter { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { match self { diff --git a/radix-engine-interface/src/types/indexed_value.rs b/radix-engine-interface/src/types/indexed_value.rs index 5482969c3a..6a23469c33 100644 --- a/radix-engine-interface/src/types/indexed_value.rs +++ b/radix-engine-interface/src/types/indexed_value.rs @@ -165,9 +165,9 @@ impl<'s, 'a> ContextualDisplay( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &ValueDisplayParameters<'_, '_, ScryptoCustomExtension>, ) -> Result<(), Self::Error> { ScryptoRawPayload::new_from_valid_slice(self.as_slice()).format(f, *context) diff --git a/radix-engine-interface/src/types/invocation.rs b/radix-engine-interface/src/types/invocation.rs index 1369fadf00..72e872937e 100644 --- a/radix-engine-interface/src/types/invocation.rs +++ b/radix-engine-interface/src/types/invocation.rs @@ -15,9 +15,9 @@ pub struct FnIdentifier { impl<'a> ContextualDisplay> for FnIdentifier { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { write!( diff --git a/radix-engine/src/errors.rs b/radix-engine/src/errors.rs index 4ea822ee07..9922036298 100644 --- a/radix-engine/src/errors.rs +++ b/radix-engine/src/errors.rs @@ -144,9 +144,9 @@ pub enum RejectionReason { impl<'a> ContextualDisplay> for RejectionReason { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &ScryptoValueDisplayContext, ) -> Result<(), Self::Error> { self.create_persistable().contextual_format(f, context) @@ -172,9 +172,9 @@ impl<'a> ContextualDisplay> for PersistableReject type Error = fmt::Error; /// See [`SerializableRuntimeError::contextual_format`] for more information. - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &ScryptoValueDisplayContext, ) -> Result<(), Self::Error> { let value = &self.encoded_rejection_reason; @@ -339,9 +339,9 @@ pub enum RuntimeError { impl<'a> ContextualDisplay> for RuntimeError { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &ScryptoValueDisplayContext, ) -> Result<(), Self::Error> { self.create_persistable().contextual_format(f, context) @@ -383,9 +383,9 @@ pub struct PersistableRuntimeError { impl<'a> ContextualDisplay> for PersistableRuntimeError { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &ScryptoValueDisplayContext, ) -> Result<(), Self::Error> { let value = &self.encoded_error; diff --git a/radix-engine/src/transaction/transaction_receipt.rs b/radix-engine/src/transaction/transaction_receipt.rs index 29d508420f..7468e0560e 100644 --- a/radix-engine/src/transaction/transaction_receipt.rs +++ b/radix-engine/src/transaction/transaction_receipt.rs @@ -1020,9 +1020,9 @@ impl<'a> TransactionReceiptDisplayContextBuilder<'a> { impl<'a> ContextualDisplay> for TransactionReceipt { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &TransactionReceiptDisplayContext<'a>, ) -> Result<(), Self::Error> { let result = &self.result; @@ -1195,9 +1195,9 @@ impl<'a, 'b> ContextualDisplay> { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &TransactionReceiptDisplayContext<'a>, ) -> Result<(), Self::Error> { let state_updates = self.0; diff --git a/radix-rust/src/contextual_display.rs b/radix-rust/src/contextual_display.rs index 47785e5b55..42cd18797e 100644 --- a/radix-rust/src/contextual_display.rs +++ b/radix-rust/src/contextual_display.rs @@ -20,9 +20,9 @@ pub trait ContextualDisplay { /// instead of a `&Context`. /// /// [`format`]: #method.format - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &Context, ) -> Result<(), Self::Error>; @@ -34,9 +34,9 @@ pub trait ContextualDisplay { /// /// [`contextual_format`]: #method.contextual_format /// [`display`]: #method.display - fn format>( + fn format>( &self, - f: &mut F, + f: &mut fmt::Formatter, context: TContext, ) -> Result<(), Self::Error> { self.contextual_format(f, &context.into()) diff --git a/radix-transaction-scenarios/src/scenario.rs b/radix-transaction-scenarios/src/scenario.rs index 02f77aa006..3d741f8453 100644 --- a/radix-transaction-scenarios/src/scenario.rs +++ b/radix-transaction-scenarios/src/scenario.rs @@ -417,9 +417,9 @@ pub enum DescribedAddress { impl<'a> ContextualDisplay> for DescribedAddress { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &AddressDisplayContext<'a>, ) -> Result<(), Self::Error> { match self { diff --git a/radix-transactions/src/data/formatter.rs b/radix-transactions/src/data/formatter.rs index 946aaac6bb..bc1ab0d8bc 100644 --- a/radix-transactions/src/data/formatter.rs +++ b/radix-transactions/src/data/formatter.rs @@ -83,9 +83,9 @@ impl<'a> Into> for Option<&'a AddressBec impl<'a> ContextualDisplay> for ManifestValue { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &ManifestDecompilationDisplayContext<'a>, ) -> Result<(), Self::Error> { format_manifest_value(f, self, context, false, 0) @@ -515,9 +515,9 @@ impl<'a> fmt::Display for DisplayableManifestValueKind<'a> { impl<'a> ContextualDisplay> for ManifestCustomValue { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &ManifestDecompilationDisplayContext<'a>, ) -> Result<(), Self::Error> { format_custom_value(f, self, context, false, 0) diff --git a/radix-transactions/src/model/hash/display.rs b/radix-transactions/src/model/hash/display.rs index 7f554e40f5..48b910d95f 100644 --- a/radix-transactions/src/model/hash/display.rs +++ b/radix-transactions/src/model/hash/display.rs @@ -31,9 +31,9 @@ macro_rules! impl_contextual_display { impl<'a> ContextualDisplay> for $type { type Error = fmt::Error; - fn contextual_format( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, context: &TransactionHashDisplayContext<'a>, ) -> Result<(), Self::Error> { if let Some(encoder) = context.encoder { diff --git a/sbor/src/representations/display/contextual_display.rs b/sbor/src/representations/display/contextual_display.rs index 4f1dc13934..679c726dd5 100644 --- a/sbor/src/representations/display/contextual_display.rs +++ b/sbor/src/representations/display/contextual_display.rs @@ -141,9 +141,9 @@ impl<'s, 'a, 'b, E: FormattableCustomExtension> ContextualDisplay( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, options: &ValueDisplayParameters<'s, 'a, E>, ) -> Result<(), Self::Error> { let context = options.get_context_and_type_id(); @@ -171,9 +171,9 @@ impl<'s, 'a, 'b, E: FormattableCustomExtension> ContextualDisplay( + fn contextual_format( &self, - f: &mut F, + f: &mut fmt::Formatter, options: &ValueDisplayParameters<'s, 'a, E>, ) -> Result<(), Self::Error> { let context = options.get_context_and_type_id();