Fix formatting for new nightly rust (#415)

Co-authored-by: Jayant Krishnamurthy <jkrishnamurthy@jumptrading.com>

Author: jayantk

cosmwasm/contracts/pyth/src/contract.rs

@@ -222,7 +222,7 @@ fn process_batch_attestation(
             "batch_size",
             format!("{}", batch_attestation.price_attestations.len()),
         )
-        .add_attribute("num_updates", format!("{}", new_attestations_cnt)))
+        .add_attribute("num_updates", format!("{new_attestations_cnt}")))
 }
 
 /// Returns true if the price_feed is newer than the stored one.

cosmwasm/contracts/pyth/src/error.rs

@@ -33,7 +33,7 @@ pub enum PythContractError {
 impl From<PythContractError> for StdError {
     fn from(other: PythContractError) -> StdError {
         StdError::GenericErr {
-            msg: format!("{}", other),
+            msg: format!("{other}"),
         }
     }
 }

pythnet/remote-executor/cli/src/main.rs

@@ -226,7 +226,7 @@ fn main() -> Result<()> {
                 &ID,
             )
             .0;
-            println!("{:?} maps to {:?}", pubkey, executor_key);
+            println!("{pubkey:?} maps to {executor_key:?}");
             Ok(())
         }
 
@@ -282,7 +282,7 @@ pub fn process_transaction(
     transaction.sign(signers, rpc_client.get_latest_blockhash()?);
     let transaction_signature =
         rpc_client.send_and_confirm_transaction_with_spinner(&transaction)?;
-    println!("Transaction successful : {:?}", transaction_signature);
+    println!("Transaction successful : {transaction_signature:?}");
     Ok(())
 }
 

solana/pyth2wormhole/client/src/attestation_cfg.rs

@@ -265,7 +265,7 @@ impl ToString for SymbolConfig {
                 product,
                 price: _,
             } => {
-                format!("Unnamed product {}", product)
+                format!("Unnamed product {product}")
             }
         }
     }

solana/pyth2wormhole/client/src/main.rs

@@ -107,7 +107,7 @@ async fn main() -> Result<(), ErrBox> {
     // off-chain explicitly
     if let Action::GetEmitter = cli.action {
         let emitter_addr = P2WEmitter::key(None, &cli.p2w_addr);
-        println!("{}", emitter_addr);
+        println!("{emitter_addr}");
 
         // Exit early
         return Ok(());

solana/pyth2wormhole/client/tests/fixtures/passthrough.rs

@@ -14,8 +14,8 @@ pub fn passthrough_entrypoint(
     account_infos: &[AccountInfo],
     _data: &[u8],
 ) -> Result<(), ProgramError> {
-    msg!(&format!("Program {}", program_id));
-    msg!(&format!("account_infos {:?}", account_infos));
+    msg!(&format!("Program {program_id}"));
+    msg!(&format!("account_infos {account_infos:?}"));
     Ok(())
 }
 

third_party/pyth/p2w-sdk/rust/src/lib.rs

@@ -189,11 +189,9 @@ impl BatchPriceAttestation {
         bytes.read_exact(magic_vec.as_mut_slice())?;
 
         if magic_vec.as_slice() != P2W_MAGIC {
-            return Err(format!(
-                "Invalid magic {:02X?}, expected {:02X?}",
-                magic_vec, P2W_MAGIC,
-            )
-            .into());
+            return Err(
+                format!("Invalid magic {magic_vec:02X?}, expected {P2W_MAGIC:02X?}",).into(),
+            );
         }
 
         let mut major_version_vec = vec![0u8; mem::size_of_val(&P2W_FORMAT_VER_MAJOR)];
@@ -203,8 +201,7 @@ impl BatchPriceAttestation {
         // Major must match exactly
         if major_version != P2W_FORMAT_VER_MAJOR {
             return Err(format!(
-                "Unsupported format major_version {}, expected {}",
-                major_version, P2W_FORMAT_VER_MAJOR
+                "Unsupported format major_version {major_version}, expected {P2W_FORMAT_VER_MAJOR}"
             )
             .into());
         }
@@ -216,8 +213,7 @@ impl BatchPriceAttestation {
         // Only older minors are not okay for this codebase
         if minor_version < P2W_FORMAT_VER_MINOR {
             return Err(format!(
-                "Unsupported format minor_version {}, expected {} or more",
-                minor_version, P2W_FORMAT_VER_MINOR
+                "Unsupported format minor_version {minor_version}, expected {P2W_FORMAT_VER_MINOR} or more"
             )
             .into());
         }
@@ -414,7 +410,7 @@ impl PriceAttestation {
             a if a == PriceStatus::Halted as u8 => PriceStatus::Halted,
             a if a == PriceStatus::Auction as u8 => PriceStatus::Auction,
             other => {
-                return Err(format!("Invalid status value {}", other).into());
+                return Err(format!("Invalid status value {other}").into());
             }
         };
 
@@ -513,7 +509,7 @@ mod tests {
         println!("Regular: {:#?}", &attestation);
         println!("Hex: {:#02X?}", &attestation);
         let bytes = attestation.serialize();
-        println!("Hex Bytes: {:02X?}", bytes);
+        println!("Hex Bytes: {bytes:02X?}");
 
         assert_eq!(
             PriceAttestation::deserialize(bytes.as_slice())?,
@@ -543,10 +539,10 @@ mod tests {
         let batch_attestation = BatchPriceAttestation {
             price_attestations: attestations,
         };
-        println!("Batch hex struct: {:#02X?}", batch_attestation);
+        println!("Batch hex struct: {batch_attestation:#02X?}");
 
         let serialized = batch_attestation.serialize()?;
-        println!("Batch hex Bytes: {:02X?}", serialized);
+        println!("Batch hex Bytes: {serialized:02X?}");
 
         let deserialized: BatchPriceAttestation =
             BatchPriceAttestation::deserialize(serialized.as_slice())?;