chore: update derive_more to version 2.0.1 (#4606)

Author: grishasobol

Cargo.lock

@@ -132,7 +132,7 @@ color-eyre = "0.6.3"
 colored = "2.1.0"
 const-str = "0.5"
 defer = "0.2.1"
-derive_more = "0.99.18"
+derive_more = { version = "2.0.1", default-features = false, features = ["full"] }
 dirs = "4.0.0"
 dyn-clonable = "0.9.0"
 enum-iterator = "1.5.0"

Cargo.toml

@@ -33,7 +33,7 @@ use num_traits::{
 
 /// Describes not empty interval start..=end.
 #[derive(Clone, Copy, PartialEq, Eq, derive_more::Display)]
-#[display(fmt = "{}..={}", start, end)]
+#[display("{start}..={end}")]
 pub struct Interval<T> {
     start: T,
     end: T,

common/numerated/src/interval.rs

@@ -77,17 +77,17 @@ pub type EnvironmentExecutionResult<Ext> = Result<BackendReport<Ext>, Environmen
 
 #[derive(Debug, derive_more::Display)]
 pub enum EnvironmentError {
-    #[display(fmt = "Actor backend error: {_1}")]
+    #[display("Actor backend error: {_1}")]
     Actor(GasAmount, String),
-    #[display(fmt = "System backend error: {_0}")]
+    #[display("System backend error: {_0}")]
     System(SystemEnvironmentError),
 }
 
 #[derive(Debug, derive_more::Display)]
 pub enum SystemEnvironmentError {
-    #[display(fmt = "Failed to create env memory: {_0:?}")]
+    #[display("Failed to create env memory: {_0:?}")]
     CreateEnvMemory(gear_sandbox::Error),
-    #[display(fmt = "Gas counter not found or has wrong type")]
+    #[display("Gas counter not found or has wrong type")]
     WrongInjectedGas,
 }
 

core-backend/src/env.rs

@@ -81,7 +81,6 @@ pub enum ActorTerminationReason {
     Success,
     Wait(Option<u32>, MessageWaitedType),
     GasAllowanceExceeded,
-    #[from]
     Trap(TrapExplanation),
 }
 
@@ -116,15 +115,15 @@ pub struct SystemTerminationReason;
     derive_more::From,
 )]
 pub enum UnrecoverableExecutionError {
-    #[display(fmt = "Invalid debug string passed in `gr_debug` syscall")]
+    #[display("Invalid debug string passed in `gr_debug` syscall")]
     InvalidDebugString,
-    #[display(fmt = "Not enough gas for operation")]
+    #[display("Not enough gas for operation")]
     NotEnoughGas,
-    #[display(fmt = "Cannot take data in payload range from message with size")]
+    #[display("Cannot take data in payload range from message with size")]
     ReadWrongRange,
-    #[display(fmt = "Unsupported version of environment variables encountered")]
+    #[display("Unsupported version of environment variables encountered")]
     UnsupportedEnvVarsVersion,
-    #[display(fmt = "Length is overflowed to read panic payload")]
+    #[display("Length is overflowed to read panic payload")]
     PanicBufferIsTooBig,
 }
 
@@ -143,10 +142,10 @@ pub enum UnrecoverableExecutionError {
 )]
 pub enum UnrecoverableMemoryError {
     /// The error occurs in attempt to access memory outside wasm program memory.
-    #[display(fmt = "Trying to access memory outside wasm program memory")]
+    #[display("Trying to access memory outside wasm program memory")]
     AccessOutOfBounds,
     /// The error occurs, when program tries to allocate in block-chain runtime more memory than allowed.
-    #[display(fmt = "Trying to allocate more memory in block-chain runtime than allowed")]
+    #[display("Trying to allocate more memory in block-chain runtime than allowed")]
     RuntimeAllocOutOfBounds,
 }
 
@@ -165,10 +164,10 @@ pub enum UnrecoverableMemoryError {
 )]
 pub enum UnrecoverableWaitError {
     /// An error occurs in attempt to wait for or wait up to zero blocks.
-    #[display(fmt = "Waiting duration cannot be zero")]
+    #[display("Waiting duration cannot be zero")]
     ZeroDuration,
     /// An error occurs in attempt to wait after reply sent.
-    #[display(fmt = "`wait()` is not allowed after reply sent")]
+    #[display("`wait()` is not allowed after reply sent")]
     WaitAfterReply,
 }
 
@@ -185,11 +184,11 @@ pub enum UnrecoverableWaitError {
     derive_more::From,
 )]
 pub enum UnrecoverableExtError {
-    #[display(fmt = "Execution error: {_0}")]
+    #[display("Execution error: {_0}")]
     Execution(UnrecoverableExecutionError),
-    #[display(fmt = "Memory error: {_0}")]
+    #[display("Memory error: {_0}")]
     Memory(UnrecoverableMemoryError),
-    #[display(fmt = "Waiting error: {_0}")]
+    #[display("Waiting error: {_0}")]
     Wait(UnrecoverableWaitError),
 }
 
@@ -207,22 +206,22 @@ pub enum UnrecoverableExtError {
 )]
 pub enum TrapExplanation {
     /// An error occurs in attempt to charge more gas than available during execution.
-    #[display(fmt = "Not enough gas to continue execution")]
+    #[display("Not enough gas to continue execution")]
     GasLimitExceeded,
     /// An error occurs in attempt to call forbidden syscall.
-    #[display(fmt = "Unable to call a forbidden function")]
+    #[display("Unable to call a forbidden function")]
     ForbiddenFunction,
     /// The error occurs when a program tries to allocate more memory than
     /// allowed.
-    #[display(fmt = "Trying to allocate more wasm program memory than allowed")]
+    #[display("Trying to allocate more wasm program memory than allowed")]
     ProgramAllocOutOfBounds,
-    #[display(fmt = "Syscall unrecoverable error: {_0}")]
+    #[display("Syscall unrecoverable error: {_0}")]
     UnrecoverableExt(UnrecoverableExtError),
-    #[display(fmt = "Panic occurred: {_0}")]
+    #[display("Panic occurred: {_0}")]
     Panic(PanicBuffer),
-    #[display(fmt = "Stack limit exceeded")]
+    #[display("Stack limit exceeded")]
     StackLimitExceeded,
-    #[display(fmt = "Reason is unknown. Possibly `unreachable` instruction is occurred")]
+    #[display("Reason is unknown. Possibly `unreachable` instruction is occurred")]
     Unknown,
 }