chore: fix fmt style

.rustfmt.toml

@@ -1,5 +1,5 @@
 edition = "2021"
-version = "Two"
+style_edition = "2021"
 
 max_width = 100
 array_width = 100

cli/src/command.rs

@@ -30,8 +30,8 @@ use baid64::DisplayBaid64;
 use bpstd::psbt::{Psbt, PsbtVer};
 use bpstd::seals::SecretSeal;
 use bpstd::{Sats, XpubDerivable};
-use bpwallet::Wallet;
 use bpwallet::cli::{BpCommand, Config, Exec};
+use bpwallet::Wallet;
 use rgb::containers::{
     BuilderSeal, ConsignmentExt, ContainerVer, ContentId, ContentSigs, Contract, FileContent,
     Supplement, Transfer, UniversalFile,
@@ -53,8 +53,8 @@ use rgbstd::persistence::{MemContractState, StockError};
 use rgbstd::stl::rgb_contract_stl;
 use rgbstd::{KnownState, OutputAssignment};
 use serde_crate::{Deserialize, Serialize};
-use strict_types::StrictVal;
 use strict_types::encoding::{FieldName, TypeName};
+use strict_types::StrictVal;
 
 use crate::RgbArgs;
 

psbt/src/lib.rs

@@ -28,12 +28,12 @@ use bp::dbc::opret::OpretProof;
 use bp::dbc::tapret::TapretProof;
 pub use bpstd::psbt::*;
 pub use rgb::*;
-use rgbstd::XChain;
 use rgbstd::containers::{AnchorSet, Batch, CloseMethodSet, Fascia, PubWitness, XPubWitness};
+use rgbstd::XChain;
 
 pub use self::rgb::{
-    PSBT_GLOBAL_RGB_TRANSITION, PSBT_IN_RGB_CONSUMED_BY, PSBT_OUT_RGB_VELOCITY_HINT,
-    PSBT_RGB_PREFIX, ProprietaryKeyRgb, RgbExt, RgbInExt, RgbOutExt, RgbPsbtError,
+    ProprietaryKeyRgb, RgbExt, RgbInExt, RgbOutExt, RgbPsbtError, PSBT_GLOBAL_RGB_TRANSITION,
+    PSBT_IN_RGB_CONSUMED_BY, PSBT_OUT_RGB_VELOCITY_HINT, PSBT_RGB_PREFIX,
 };
 
 #[derive(Clone, Eq, PartialEq, Debug, Display, Error)]

psbt/src/rgb.rs

@@ -22,7 +22,7 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap};
 
 use amplify::confinement::{Confined, SmallOrdMap, U24};
-use amplify::{FromSliceError, confinement};
+use amplify::{confinement, FromSliceError};
 use bp::dbc::Method;
 use bp::seals::txout::CloseMethod;
 use bpstd::psbt;
@@ -418,7 +418,11 @@ pub trait RgbOutExt {
 impl RgbOutExt for psbt::Output {
     fn rgb_velocity_hint(&self) -> Option<VelocityHint> {
         let data = self.proprietary.get(&PropKey::rgb_out_velocity_hint())?;
-        if data.len() != 1 { None } else { data.first().map(VelocityHint::with_value) }
+        if data.len() != 1 {
+            None
+        } else {
+            data.first().map(VelocityHint::with_value)
+        }
     }
 
     fn set_rgb_velocity_hint(&mut self, hint: VelocityHint) -> bool {

src/descriptor.rs

@@ -25,8 +25,8 @@ use std::iter;
 use std::str::FromStr;
 
 use amplify::Wrapper;
-use bp::dbc::Method;
 use bp::dbc::tapret::TapretCommitment;
+use bp::dbc::Method;
 use bp::seals::txout::CloseMethod;
 use bp::{LegacyPk, SigScript, Witness};
 use bpstd::{

src/indexers/electrum_blocking.rs

@@ -95,21 +95,17 @@ impl RgbResolver for Client {
         let Some(confirmations) = tx_details.get("confirmations") else {
             return Ok(WitnessOrd::Tentative);
         };
-        let confirmations = check!(
-            confirmations
-                .as_u64()
-                .and_then(|x| u32::try_from(x).ok())
-                .ok_or(Error::InvalidResponse(tx_details.clone()))
-        );
+        let confirmations = check!(confirmations
+            .as_u64()
+            .and_then(|x| u32::try_from(x).ok())
+            .ok_or(Error::InvalidResponse(tx_details.clone())));
         if confirmations == 0 {
             return Ok(WitnessOrd::Tentative);
         }
-        let block_time = check!(
-            tx_details
-                .get("blocktime")
-                .and_then(|v| v.as_i64())
-                .ok_or(Error::InvalidResponse(tx_details.clone()))
-        );
+        let block_time = check!(tx_details
+            .get("blocktime")
+            .and_then(|v| v.as_i64())
+            .ok_or(Error::InvalidResponse(tx_details.clone())));
 
         let tip_height = u32::try_from(header.height).map_err(|_| s!("impossible height value"))?;
         let height: isize = (tip_height - confirmations) as isize;
@@ -127,10 +123,8 @@ impl RgbResolver for Client {
 
         let height =
             check!(NonZeroU32::new(tx_height).ok_or(Error::InvalidResponse(tx_details.clone())));
-        let pos = check!(
-            WitnessPos::bitcoin(height, block_time)
-                .ok_or(Error::InvalidResponse(tx_details.clone()))
-        );
+        let pos = check!(WitnessPos::bitcoin(height, block_time)
+            .ok_or(Error::InvalidResponse(tx_details.clone())));
 
         Ok(WitnessOrd::Mined(pos))
     }

src/pay.rs

@@ -80,15 +80,15 @@ struct ContractOutpointsFilter<
 }
 
 impl<
-    'stock,
-    'wallet,
-    W: WalletProvider<K, L2> + ?Sized,
-    K,
-    S: StashProvider,
-    H: StateProvider,
-    P: IndexProvider,
-    L2: Layer2,
-> AssignmentsFilter for ContractOutpointsFilter<'stock, 'wallet, W, K, S, H, P, L2>
+        'stock,
+        'wallet,
+        W: WalletProvider<K, L2> + ?Sized,
+        K,
+        S: StashProvider,
+        H: StateProvider,
+        P: IndexProvider,
+        L2: Layer2,
+    > AssignmentsFilter for ContractOutpointsFilter<'stock, 'wallet, W, K, S, H, P, L2>
 where W::Descr: DescriptorRgb<K>
 {
     fn should_include(&self, output: impl Into<XOutpoint>, id: Option<XWitnessId>) -> bool {

src/wallet.rs

@@ -101,8 +101,14 @@ impl<K, D: DescriptorRgb<K>, S: StashProvider, H: StateProvider, P: IndexProvide
     }
 }
 
-impl<K, W: WalletProvider<K, L2>, S: StashProvider, H: StateProvider, P: IndexProvider, L2: Layer2>
-    RgbWallet<W, K, S, H, P, L2>
+impl<
+        K,
+        W: WalletProvider<K, L2>,
+        S: StashProvider,
+        H: StateProvider,
+        P: IndexProvider,
+        L2: Layer2,
+    > RgbWallet<W, K, S, H, P, L2>
 where W::Descr: DescriptorRgb<K>
 {
     pub fn new(stock: Stock<S, H, P>, wallet: W) -> Self {