Merge pull request #320 from Concordium/cor-1763

Update Rust formatter

Author: eb-concordium

.github/workflows/build-and-test.yaml

@@ -14,9 +14,6 @@ on:
 
   workflow_dispatch: # allows manual trigger
 
-env:
-  RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
-
 jobs:
   "lint_fmt":
     name: lint:fmt
@@ -26,8 +23,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Format
         run: |
-          rustup +$RUST_FMT component add rustfmt
-          cargo +$RUST_FMT fmt -- --color=always --check
+          rustup component add rustfmt
+          cargo fmt -- --color=always --check
 
   "lint_doc":
     name: lint:doc

concordium-base

@@ -21,13 +21,13 @@ struct App {
         long = "lastfinal",
         help = "Block to query the data in. Defaults to last finalized block."
     )]
-    block:    BlockIdentifier,
+    block: BlockIdentifier,
     #[structopt(
         long = "num",
         help = "How many queries to make in parallel.",
         default_value = "1"
     )]
-    num:      usize,
+    num: usize,
 }
 
 async fn make_queries<
@@ -43,7 +43,8 @@ async fn make_queries<
 ) -> (tokio::task::JoinHandle<()>, tokio::sync::mpsc::Receiver<A>)
 where
     Chunks::IntoIter: Send,
-    I::IntoIter: Send, {
+    I::IntoIter: Send,
+{
     let (sender, receiver) = tokio::sync::mpsc::channel::<A>(n);
     let sender = async move {
         'outer: for chunk in iter {

examples/balance-summary.rs

@@ -31,12 +31,12 @@ struct App {
         long = "from",
         help = "Starting time (format 2023-06-22T14:00:00+0200). Defaults to genesis time."
     )]
-    from:     Option<chrono::DateTime<chrono::Utc>>,
+    from: Option<chrono::DateTime<chrono::Utc>>,
     #[structopt(
         long = "to",
         help = "End time (format 2023-06-22T14:00:00+0200). Defaults to the time the tool has run."
     )]
-    to:       Option<chrono::DateTime<Utc>>,
+    to: Option<chrono::DateTime<Utc>>,
 }
 
 #[tokio::main(flavor = "multi_thread")]

examples/block-stats.rs

@@ -42,9 +42,9 @@ struct App {
     )]
     endpoint: Endpoint,
     #[structopt(long = "identity-provider")]
-    idp:      PathBuf,
+    idp: PathBuf,
     #[structopt(long = "tps")]
-    tps:      u16,
+    tps: u16,
 }
 
 #[tokio::main(flavor = "multi_thread")]
@@ -87,7 +87,7 @@ async fn main() -> anyhow::Result<()> {
             let created_at = YearMonth::now();
             let alist = AttributeList {
                 valid_to: YearMonth {
-                    year:  created_at.year + 1,
+                    year: created_at.year + 1,
                     month: created_at.month,
                 },
                 created_at,
@@ -108,7 +108,7 @@ async fn main() -> anyhow::Result<()> {
             let data = {
                 let mut csprng = thread_rng();
                 let cdata = CredentialData {
-                    keys:      vec![(
+                    keys: vec![(
                         KeyIndex::from(0),
                         common::types::KeyPair::generate(&mut csprng),
                     )]
@@ -130,9 +130,9 @@ async fn main() -> anyhow::Result<()> {
 
                 let pub_info_for_ip = PublicInformationForIp {
                     id_cred_pub: ArCurve::generate(&mut csprng),
-                    reg_id:      cred_id,
-                    vk_acc:      CredentialPublicKeys {
-                        keys:      cdata.get_public_keys(),
+                    reg_id: cred_id,
+                    vk_acc: CredentialPublicKeys {
+                        keys: cdata.get_public_keys(),
                         threshold: cdata.get_threshold(),
                     },
                 };
@@ -148,7 +148,7 @@ async fn main() -> anyhow::Result<()> {
                 let keys = AccountKeys::from(cdata);
                 let item = BlockItem::<Payload>::from(AccountCredentialMessage {
                     message_expiry: expiry,
-                    credential:     AccountCredential::Initial { icdi },
+                    credential: AccountCredential::Initial { icdi },
                 });
                 (address, item, keys, cred_id_exponent)
             };

examples/create-initial-accounts.rs

@@ -14,7 +14,7 @@ struct App {
     )]
     endpoint: v2::Endpoint,
     #[structopt(long = "account")]
-    account:  AccountAddress,
+    account: AccountAddress,
 }
 
 #[tokio::main(flavor = "multi_thread")]

examples/find-account.rs

@@ -26,19 +26,19 @@ struct App {
         help = "GRPC interface of the node.",
         default_value = "http://localhost:20000"
     )]
-    endpoint:  endpoints::Endpoint,
+    endpoint: endpoints::Endpoint,
     #[structopt(long = "account", help = "Path to the account key file.")]
     keys_path: PathBuf,
     #[structopt(subcommand, help = "The action you want to perform.")]
-    action:    Action,
+    action: Action,
 }
 
 #[derive(StructOpt)]
 enum Action {
     #[structopt(about = "Initialize the contract with the provided weather")]
     Init {
         #[structopt(long, help = "The initial weather.")]
-        weather:    Weather,
+        weather: Weather,
         #[structopt(
             long,
             help = "The module reference used for initializing the contract instance."

examples/init-update-contract.rs

@@ -26,26 +26,26 @@ struct App {
         long = "lastfinal",
         help = "Block to query the data in. Defaults to last finalized block."
     )]
-    block:    BlockIdentifier,
+    block: BlockIdentifier,
     #[structopt(
         long = "out",
         help = "File to output the list of accounts with their balances to."
     )]
-    out:      PathBuf,
+    out: PathBuf,
     #[structopt(
         long = "num",
         help = "How many queries to make in parallel.",
         default_value = "8"
     )]
-    num:      usize,
+    num: usize,
 }
 
 #[derive(SerdeSerialize)]
 struct Row {
     #[serde(rename = "Account address")]
-    address:  AccountAddress,
+    address: AccountAddress,
     #[serde(rename = "Account balance in CCD", serialize_with = "to_string")]
-    balance:  Amount,
+    balance: Amount,
     #[serde(rename = "isBaker")]
     is_baker: bool,
     #[serde(rename = "Account type")]

examples/list-account-balances.rs

@@ -20,11 +20,11 @@ struct App {
         help = "Number of parallel queries to make.",
         default_value = "4"
     )]
-    num:      usize,
+    num: usize,
     #[structopt(long = "from", help = "Starting time. Defaults to genesis time.")]
-    from:     Option<chrono::DateTime<chrono::Utc>>,
+    from: Option<chrono::DateTime<chrono::Utc>>,
     #[structopt(long = "to", help = "End time. Defaults to infinity.")]
-    to:       Option<chrono::DateTime<chrono::Utc>>,
+    to: Option<chrono::DateTime<chrono::Utc>>,
 }
 
 #[tokio::main(flavor = "multi_thread")]

examples/list-account-creations.rs

@@ -26,17 +26,17 @@ struct App {
         help = "How many queries to make in parallel.",
         default_value = "1"
     )]
-    num:      usize,
+    num: usize,
     #[structopt(long = "from", help = "Starting time. Defaults to genesis time.")]
-    from:     Option<chrono::DateTime<chrono::Utc>>,
+    from: Option<chrono::DateTime<chrono::Utc>>,
     #[structopt(long = "to", help = "End time. Defaults to infinity.")]
-    to:       Option<chrono::DateTime<Utc>>,
+    to: Option<chrono::DateTime<Utc>>,
     #[structopt(
         long = "only",
         help = "Only display the given transaction type(s). If no specific types are given all \
                 types are displayed."
     )]
-    types:    Vec<String>,
+    types: Vec<String>,
 }
 
 #[tokio::main(flavor = "multi_thread")]