ci: enforce cargo fmt lint check, ran cargo fmt

thegrumpylion · Mar 24, 2020 · 3545fdd · 3545fdd
1 parent 1ceb9c9
commit 3545fdd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -76,7 +76,9 @@ jobs:
         toolchain: nightly
         components: clippy, rustfmt
         override: true
-    - name: Check formatting  # Doesn't fail build
-      run: cargo fmt -- --check || true
+    - name: Check formatting
+      if: always()
+      run: cargo fmt -- --check
     - name: Run clippy  # Doesn't fail build
+      if: always()
       run: cargo clippy
diff --git a/aw-client-rust/tests/test.rs b/aw-client-rust/tests/test.rs
@@ -23,7 +23,7 @@ mod test {
             match client.get_info() {
                 Ok(_) => break,
                 Err(err) => {
-                    if i == timeout_s-1 {
+                    if i == timeout_s - 1 {
                         panic!(
                             "Timed out starting aw-server after {}s: {:?}",
                             timeout_s, err

diff --git a/aw-models/src/event.rs b/aw-models/src/event.rs
@@ -24,9 +24,9 @@ impl Event {
 
 impl PartialEq for Event {
     fn eq(&self, other: &Event) -> bool {
-        !(self.timestamp != other.timestamp ||
-            self.duration != other.duration ||
-            self.data != other.data)
+        !(self.timestamp != other.timestamp
+            || self.duration != other.duration
+            || self.data != other.data)
     }
 }
 

diff --git a/aw-models/src/timeinterval.rs b/aw-models/src/timeinterval.rs
@@ -19,10 +19,7 @@ pub enum TimeIntervalError {
 
 impl TimeInterval {
     pub fn new(start: DateTime<Utc>, end: DateTime<Utc>) -> TimeInterval {
-        TimeInterval {
-            start,
-            end,
-        }
+        TimeInterval { start, end }
     }
 
     pub fn new_from_string(period: &str) -> Result<TimeInterval, TimeIntervalError> {

diff --git a/aw-query/src/functions.rs b/aw-query/src/functions.rs
@@ -429,8 +429,8 @@ mod qfunctions {
     ) -> Result<DataType, QueryError> {
         // typecheck
         validate::args_length(&args, 2)?;
-        let events : Vec<Event> = (&args[0]).try_into()?;
-        let filter_events : Vec<Event> = (&args[1]).try_into()?;
+        let events: Vec<Event> = (&args[0]).try_into()?;
+        let filter_events: Vec<Event> = (&args[1]).try_into()?;
 
         let mut filtered_events = aw_transform::filter_period_intersect(&events, &filter_events);
         let mut filtered_tagged_events = Vec::new();

diff --git a/aw-transform/src/classify.rs b/aw-transform/src/classify.rs
@@ -46,9 +46,7 @@ impl RuleTrait for RegexRule {
             .data
             .values()
             .filter(|val| val.is_string())
-            .any(|val| {
-                self.regex.is_match(val.as_str().unwrap())
-            })
+            .any(|val| self.regex.is_match(val.as_str().unwrap()))
     }
 }