From c8b6d3faa8a54d237cf32ec0c55c951c62411f58 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Tue, 10 Oct 2017 15:50:31 +0300
Subject: [PATCH] Trying out clippy and rustfmt CI-integrations.

---
 .gitlab-ci.yml          | 28 +++++++++++++++++++++++++---
 hammond-gtk/src/main.rs |  8 ++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1b99bd..537efd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,8 @@ test:stable:
   script:
   - rustc --version && cargo --version      # Print version info for debugging
   - cargo build --all
-  # - cargo test --all --verbose --jobs 1
   - cargo test --all --verbose
+  # - cargo test --all --verbose --jobs 1
 
 # Use cargo to test the project
 test:nightly:
@@ -27,8 +27,30 @@ test:nightly:
   image: "rustlang/rust:nightly"
   script:
   - rustc --version && cargo --version      # Print version info for debugging
-  - cargo build
-  - cargo test --verbose
+  - cargo build --all
+  - cargo test --all --verbose
   # - cargo test --verbose --jobs 1
   # - cargo bench
   allow_failure: true
+
+# Configure and run rustfmt on nightly
+# Exits and builds fails if on bad format
+test:rustfmt:
+  image: "rustlang/rust:nightly"
+  before_script:
+  - export PATH="$PATH:$HOME/.cargo/bin"
+  - which rustfmt || cargo install rustfmt
+  script:
+  - rustc --version && cargo --version
+  - cargo fmt --all -- --write-mode=diff
+
+# Configure and run clippy on nightly
+test:clippy:
+  image: "rustlang/rust:nightly"
+  before_script:
+  - export PATH="$PATH:$HOME/.cargo/bin"
+  - which rustfmt || cargo install clippy
+  script:
+  - rustc --version && cargo --version
+  - cargo clippy
+  allow_failure: true
diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs
index 34fadc3..2097699 100644
--- a/hammond-gtk/src/main.rs
+++ b/hammond-gtk/src/main.rs
@@ -39,11 +39,11 @@ fn main() {
     let header: gtk::HeaderBar = builder.get_object("headerbar1").unwrap();
     window.set_titlebar(&header);
 
-    let refresh_button : gtk::Button = builder.get_object("refbutton").unwrap();
+    let refresh_button: gtk::Button = builder.get_object("refbutton").unwrap();
     // TODO: Have a small dropdown menu
-    let add_button : gtk::Button = builder.get_object("addbutton").unwrap();
-    let search_button : gtk::Button = builder.get_object("searchbutton").unwrap();
-    let home_button : gtk::Button = builder.get_object("homebutton").unwrap();
+    let add_button: gtk::Button = builder.get_object("addbutton").unwrap();
+    let search_button: gtk::Button = builder.get_object("searchbutton").unwrap();
+    let home_button: gtk::Button = builder.get_object("homebutton").unwrap();
 
     // FIXME: This locks the ui atm.
     refresh_button.connect_clicked(|_| {