From 6204c30099e19aab5f08d1d4b5b1188b4304c614 Mon Sep 17 00:00:00 2001
From: Mathieu David <mathieu.david@sky-hero.com>
Date: Thu, 10 Jun 2021 18:01:32 +0200
Subject: [PATCH] rustfmt pass and fix clippy on CI

---
 .github/workflows/ci.yaml |  2 +-
 build.rs                  | 25 +++++++++++++++----------
 src/delay.rs              |  2 +-
 src/encoder.rs            |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 44dedf6b..a6d26afc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -37,7 +37,7 @@ jobs:
           use-cross: true
           command: clippy
           # dummy feature to satisfy build.rs
-          args: --features stm32l0x1 -- -D warnings
+          args: --features mcu-STM32L083VZTx -- -D warnings
   package:
     name: Cargo package
     runs-on: ubuntu-latest
diff --git a/build.rs b/build.rs
index 1be590ed..47dabee6 100644
--- a/build.rs
+++ b/build.rs
@@ -33,10 +33,11 @@ fn main() {
             (64, cfg!(feature = "flash-64")),
             (128, cfg!(feature = "flash-128")),
             (192, cfg!(feature = "flash-192")),
-        ].iter()
-            .filter(|(_, f)| *f)
-            .map(|(f, _)| *f)
-            .collect();
+        ]
+        .iter()
+        .filter(|(_, f)| *f)
+        .map(|(f, _)| *f)
+        .collect();
 
         if flash_features.len() != 1 {
             panic!("\n\nMust select exactly one flash size for linker script generation!\n\
@@ -50,10 +51,11 @@ fn main() {
             (2, cfg!(feature = "ram-2")),
             (8, cfg!(feature = "ram-8")),
             (20, cfg!(feature = "ram-20")),
-        ].iter()
-            .filter(|(_, f)| *f)
-            .map(|(f, _)| *f)
-            .collect();
+        ]
+        .iter()
+        .filter(|(_, f)| *f)
+        .map(|(f, _)| *f)
+        .collect();
 
         if ram_features.len() != 1 {
             panic!("\n\nMust select exactly one ram size for linker script generation!\n\
@@ -63,11 +65,14 @@ fn main() {
 
         let ram_size = ram_features[0];
 
-        let linker = format!(r#"MEMORY
+        let linker = format!(
+            r#"MEMORY
 {{
     FLASH : ORIGIN = 0x08000000, LENGTH = {}K
     RAM : ORIGIN = 0x20000000, LENGTH = {}K
-}}"#, flash_size, ram_size);
+}}"#,
+            flash_size, ram_size
+        );
 
         File::create(out.join("memory.x"))
             .unwrap()
diff --git a/src/delay.rs b/src/delay.rs
index af378634..867cc985 100755
--- a/src/delay.rs
+++ b/src/delay.rs
@@ -29,7 +29,7 @@ impl Delay {
         let freq = clocks.sys_clk().0;
         assert!(freq > 1_000_000_u32);
         let ticks_per_us = freq / 1_000_000_u32;
-        Delay { syst, ticks_per_us }
+        Delay { ticks_per_us, syst }
     }
     pub fn delay<T>(&mut self, delay: T)
     where
diff --git a/src/encoder.rs b/src/encoder.rs
index d06870b9..5ae88686 100644
--- a/src/encoder.rs
+++ b/src/encoder.rs
@@ -212,9 +212,9 @@ macro_rules! encoders {
                     };
 
                     Status {
+                        direction,
                         did_overflow,
                         count,
-                        direction,
                     }
                 }