Run cargo fmt on whole project (#272)

* Fix fallback in #270

Wrong order of arguments in `format!`.

* fmt: Remove invalid struct_lit_width option

* ci: Reformat travis config

* ci: Checking style before build

* fmt: Run cargo fmt on whole project

Author: tesuji

.travis.yml

@@ -3,7 +3,7 @@ notifications:
   email: false
 language: rust
 rust:
-- nightly
+  - nightly
 cache:
   cargo: true
   directories:
@@ -15,31 +15,34 @@ addons:
     - curl
     - libpq-dev
     - pkg-config
+before_install:
+  - rustup component add rustfmt
+  - cargo fmt --all -- --check
 install:
-- export RUST_LOG=debug,hyper=info,rustc=error,cargo=error,jobserver=error
-- export GITHUB_WEBHOOK_SECRETS=none
-- export GITHUB_ACCESS_TOKEN=
-- export GITHUB_SCRAPE_INTERVAL=6000
-- export GITHUB_USER_AGENT=none-agent-with-left-beef
-- export POST_COMMENTS=false
-- export RUST_BACKTRACE=1
-- export PATH=$PATH:$HOME/.cargo/bin
-- export DATABASE_URL=postgres://localhost/dashboard
-- export DATABASE_POOL_SIZE=5
-- rustup default $(cat rust-toolchain)
-- cargo install cargo-update || true
-- cargo install-update-config diesel_cli --default-features false --feature postgres
-- cargo install-update -i diesel_cli
+  - export RUST_LOG=debug,hyper=info,rustc=error,cargo=error,jobserver=error
+  - export GITHUB_WEBHOOK_SECRETS=none
+  - export GITHUB_ACCESS_TOKEN=
+  - export GITHUB_SCRAPE_INTERVAL=6000
+  - export GITHUB_USER_AGENT=none-agent-with-left-beef
+  - export POST_COMMENTS=false
+  - export RUST_BACKTRACE=1
+  - export PATH=$PATH:$HOME/.cargo/bin
+  - export DATABASE_URL=postgres://localhost/dashboard
+  - export DATABASE_POOL_SIZE=5
+  - rustup default $(cat rust-toolchain)
+  - cargo install cargo-update || true
+  - cargo install-update-config diesel_cli --default-features false --feature postgres
+  - cargo install-update -i diesel_cli
 before_script:
-- diesel setup
-- diesel migration run
-- psql -q -d $DATABASE_URL < githubuser-backup.pg
+  - diesel setup
+  - diesel migration run
+  - psql -q -d $DATABASE_URL < githubuser-backup.pg
 script:
-- cargo build
-- cargo test
+  - cargo build
+  - cargo test
 before_deploy:
-- DATABASE_URL=$(heroku config:get DATABASE_URL -a rfcbot-rs) diesel migration run
+  - DATABASE_URL=$(heroku config:get DATABASE_URL -a rfcbot-rs) diesel migration run
 deploy:
-  provider: heroku
-  api_key:
-    secure: "HgoF2n6pnzUhZ4oBNRo3gSoxj/o9x7QW0fKaj9sEYDNkTgak9IX3ha0antoYKB7dMw7IvB8oqVAHqldlGlG/kxUDKN8kaYA4O7CZgKP0auykTkmH61FP7MKV0hV0vyFfJLSraClVw/DL5tjYybs/rSBWFAvwttIB7QlcFv5sLIuwe5nHzftFfxba0H1+0oynO55FlmRzFBWydlFVNTsGVRddFHPgG3f2V9YYIjT18MKvn+BcV7WUq6QweB/3RjwTDYzws9mcWt6i3ju1D4nDTDVbtzeLs7Yt+NhnvrDeB+2FWSrV03LCjnnzv2zCUaROU522Vns0ZC/+2b9V3YbcCBJRA8QLBdo12JUCUzrdk8DOqIYKwlW6WbI3DcgRGz9Li7Dw2466+lsPidBfcdxnziTvc+r/2r6dKv3q7nwDpoZEyxnnTumPf50PJZs/lDu99Vo5C2NIdN2O5sqDHd8AJTLtWrY3FdN5MGKqTm0R9rVnObvUkTKbZJrDn39O5MU3mnHINUT+6ZCnNgra7rNn7Ai3tA1RKPB7kIZo41Td8j56iSLANXziCh0MikPfQv4x1scl3c1h5bR8ZqxVqH4IODjDJrJv43+hsbE9xGsmrC4OaqImLUpl/8zi6a4zZ8Na1AiFKVcdLZ9xt40/2yg7ysn53SCpQ5vty/j36clNwAE="
+  - provider: heroku
+    api_key:
+      secure: "HgoF2n6pnzUhZ4oBNRo3gSoxj/o9x7QW0fKaj9sEYDNkTgak9IX3ha0antoYKB7dMw7IvB8oqVAHqldlGlG/kxUDKN8kaYA4O7CZgKP0auykTkmH61FP7MKV0hV0vyFfJLSraClVw/DL5tjYybs/rSBWFAvwttIB7QlcFv5sLIuwe5nHzftFfxba0H1+0oynO55FlmRzFBWydlFVNTsGVRddFHPgG3f2V9YYIjT18MKvn+BcV7WUq6QweB/3RjwTDYzws9mcWt6i3ju1D4nDTDVbtzeLs7Yt+NhnvrDeB+2FWSrV03LCjnnzv2zCUaROU522Vns0ZC/+2b9V3YbcCBJRA8QLBdo12JUCUzrdk8DOqIYKwlW6WbI3DcgRGz9Li7Dw2466+lsPidBfcdxnziTvc+r/2r6dKv3q7nwDpoZEyxnnTumPf50PJZs/lDu99Vo5C2NIdN2O5sqDHd8AJTLtWrY3FdN5MGKqTm0R9rVnObvUkTKbZJrDn39O5MU3mnHINUT+6ZCnNgra7rNn7Ai3tA1RKPB7kIZo41Td8j56iSLANXziCh0MikPfQv4x1scl3c1h5bR8ZqxVqH4IODjDJrJv43+hsbE9xGsmrC4OaqImLUpl/8zi6a4zZ8Na1AiFKVcdLZ9xt40/2yg7ysn53SCpQ5vty/j36clNwAE="

rustfmt.toml

@@ -1,3 +1,2 @@
-struct_lit_width = 24
 fn_single_line = true
 format_strings = false

src/config.rs

@@ -12,11 +12,11 @@ lazy_static! {
             Ok(c) => {
                 info!("Configuration parsed from environment variables.");
                 c
-            },
+            }
             Err(missing) => {
                 error!("Unable to load environment variables {:?}", missing);
                 panic!("Unable to load environment variables {:?}", missing);
-            },
+            }
         }
     };
 }
@@ -34,8 +34,9 @@ pub struct Config {
 
 impl Config {
     pub fn check(&self) -> bool {
-        !self.db_url.is_empty() && !self.github_access_token.is_empty() &&
-        !self.github_user_agent.is_empty()
+        !self.db_url.is_empty()
+            && !self.github_access_token.is_empty()
+            && !self.github_user_agent.is_empty()
     }
 }
 
@@ -50,22 +51,24 @@ const POST_COMMENTS: &'static str = "POST_COMMENTS";
 // this is complex, but we'll shortly need a lot more config items
 // so checking them automagically seems like a nice solution
 pub fn init() -> Result<Config, Vec<&'static str>> {
-
     let mut vars: BTreeMap<&'static str, Result<String, _>> = BTreeMap::new();
-    let keys = vec![DB_URL,
-                    DB_POOL_SIZE,
-                    GITHUB_TOKEN,
-                    GITHUB_WEBHOOK_SECRETS,
-                    GITHUB_UA,
-                    POST_COMMENTS];
+    let keys = vec![
+        DB_URL,
+        DB_POOL_SIZE,
+        GITHUB_TOKEN,
+        GITHUB_WEBHOOK_SECRETS,
+        GITHUB_UA,
+        POST_COMMENTS,
+    ];
 
     for var in keys {
         vars.insert(var, env::var(var));
     }
 
     let all_found = vars.iter().all(|(_, v)| v.is_ok());
     if all_found {
-        let mut vars = vars.into_iter()
+        let mut vars = vars
+            .into_iter()
             .map(|(k, v)| (k, v.unwrap()))
             .collect::<BTreeMap<_, _>>();
 
@@ -89,19 +92,19 @@ pub fn init() -> Result<Config, Vec<&'static str>> {
         let webhook_secrets = webhook_secrets.split(',').map(String::from).collect();
 
         Ok(Config {
-               db_url: db_url,
-               db_pool_size: db_pool_size,
-               github_access_token: gh_token,
-               github_user_agent: gh_ua,
-               github_webhook_secrets: webhook_secrets,
-               github_interval_mins: gh_interval,
-               post_comments: post_comments,
-           })
-
+            db_url: db_url,
+            db_pool_size: db_pool_size,
+            github_access_token: gh_token,
+            github_user_agent: gh_ua,
+            github_webhook_secrets: webhook_secrets,
+            github_interval_mins: gh_interval,
+            post_comments: post_comments,
+        })
     } else {
-        Err(vars.iter()
-                .filter(|&(_, v)| v.is_err())
-                .map(|(&k, _)| k)
-                .collect())
+        Err(vars
+            .iter()
+            .filter(|&(_, v)| v.is_err())
+            .map(|(&k, _)| k)
+            .collect())
     }
 }

src/domain/github.rs

@@ -5,7 +5,7 @@ use chrono::NaiveDateTime;
 use super::schema::*;
 
 #[derive(AsChangeset, Clone, Debug, Queryable)]
-#[table_name="githubsync"]
+#[table_name = "githubsync"]
 pub struct GitHubSync {
     pub id: i32,
     pub successful: bool,
@@ -14,24 +14,36 @@ pub struct GitHubSync {
 }
 
 #[derive(Clone, Debug, Insertable)]
-#[table_name="githubsync"]
+#[table_name = "githubsync"]
 pub struct GitHubSyncPartial {
     pub successful: bool,
     pub ran_at: NaiveDateTime,
     pub message: Option<String>,
 }
 
-#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
-         Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[table_name="githubuser"]
+#[derive(
+    AsChangeset,
+    Clone,
+    Debug,
+    Deserialize,
+    Eq,
+    Insertable,
+    Ord,
+    PartialEq,
+    PartialOrd,
+    Queryable,
+    Serialize,
+)]
+#[table_name = "githubuser"]
 pub struct GitHubUser {
     pub id: i32,
     pub login: String,
 }
 
-#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
-         Ord, PartialEq, PartialOrd, Queryable)]
-#[table_name="milestone"]
+#[derive(
+    AsChangeset, Clone, Debug, Deserialize, Eq, Insertable, Ord, PartialEq, PartialOrd, Queryable,
+)]
+#[table_name = "milestone"]
 #[changeset_options(treat_none_as_null = "true")]
 pub struct Milestone {
     pub id: i32,
@@ -49,9 +61,20 @@ pub struct Milestone {
     pub repository: String,
 }
 
-#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
-         Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[table_name="issue"]
+#[derive(
+    AsChangeset,
+    Clone,
+    Debug,
+    Deserialize,
+    Eq,
+    Insertable,
+    Ord,
+    PartialEq,
+    PartialOrd,
+    Queryable,
+    Serialize,
+)]
+#[table_name = "issue"]
 pub struct IssuePartial {
     pub number: i32,
     pub fk_milestone: Option<i32>,
@@ -91,9 +114,10 @@ impl IssuePartial {
     }
 }
 
-#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord,
-         PartialEq, PartialOrd, Queryable, Serialize)]
-#[table_name="issue"]
+#[derive(
+    AsChangeset, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize,
+)]
+#[table_name = "issue"]
 #[changeset_options(treat_none_as_null = "true")]
 pub struct Issue {
     pub id: i32,
@@ -113,9 +137,20 @@ pub struct Issue {
     pub repository: String,
 }
 
-#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
-         Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[table_name="issuecomment"]
+#[derive(
+    AsChangeset,
+    Clone,
+    Debug,
+    Deserialize,
+    Eq,
+    Insertable,
+    Ord,
+    PartialEq,
+    PartialOrd,
+    Queryable,
+    Serialize,
+)]
+#[table_name = "issuecomment"]
 #[changeset_options(treat_none_as_null = "true")]
 pub struct IssueComment {
     pub id: i32,
@@ -127,9 +162,10 @@ pub struct IssueComment {
     pub repository: String,
 }
 
-#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
-         Ord, PartialEq, PartialOrd, Queryable)]
-#[table_name="pullrequest"]
+#[derive(
+    AsChangeset, Clone, Debug, Deserialize, Eq, Insertable, Ord, PartialEq, PartialOrd, Queryable,
+)]
+#[table_name = "pullrequest"]
 #[changeset_options(treat_none_as_null = "true")]
 pub struct PullRequest {
     pub number: i32,