Transfer to 2018 edition (#273)

* Transfer to 2018 edition

Deny Rust 2018 idioms

* src: Fix redundant imports

* clippy: Fix or_fun_call

* clippy: Fix single_char_pattern

* clippy: Fix redundant_field_names

* clippy: Fix redundant_closure

* clippy: Fix const_static_lifetime

* Update rust-toolchain version

* cargo: Sort dependencies by alphanumeric order

* More clippy fixes

* clone_double_ref
* expect_fun_call
* unnecessary_operation

* ci: Reformatting config

* ci: Update PostgreSQL version to 9.6

Fix unrecognized configuration parameter "idle_in_transaction_session_timeout"

* Fix over rate limiting

* test: Ignore `team_members_exist`

We now load all usernames from the team repo, and we import into
the database missing users received from the team api.

Author: tesuji

.travis.yml

@@ -1,15 +1,18 @@
-dist: trusty
+dist: xenial
 notifications:
   email: false
 language: rust
 rust:
-  - nightly
+  # sync in `rust-toolchain` file
+  - nightly-2019-04-26
 cache:
-  cargo: true
   directories:
-  - "$HOME/.rustup"
+    - "$HOME/.cargo"
+# But don't cache the cargo registry
+before_cache:
+  - rm -rf "$HOME/.cargo/registry"
 addons:
-  postgresql: '9.5'
+  postgresql: "9.6"
   apt:
     packages:
     - curl
@@ -21,12 +24,12 @@ before_install:
 install:
   - export RUST_LOG=debug,hyper=info,rustc=error,cargo=error,jobserver=error
   - export GITHUB_WEBHOOK_SECRETS=none
-  - export GITHUB_ACCESS_TOKEN=
+  - export GITHUB_ACCESS_TOKEN="$GITHUB_ACCESS_TOKEN"
   - export GITHUB_SCRAPE_INTERVAL=6000
-  - export GITHUB_USER_AGENT=none-agent-with-left-beef
+  - export GITHUB_USER_AGENT=rfcbot-rs
   - export POST_COMMENTS=false
   - export RUST_BACKTRACE=1
-  - export PATH=$PATH:$HOME/.cargo/bin
+  - . "$HOME"/.cargo/env
   - export DATABASE_URL=postgres://localhost/dashboard
   - export DATABASE_POOL_SIZE=5
   - rustup default $(cat rust-toolchain)
@@ -36,7 +39,7 @@ install:
 before_script:
   - diesel setup
   - diesel migration run
-  - psql -q -d $DATABASE_URL < githubuser-backup.pg
+  - psql -q -d "$DATABASE_URL" < githubuser-backup.pg
 script:
   - cargo build
   - cargo test

Cargo.toml

@@ -2,13 +2,18 @@
 authors = ["Adam Perry <[email protected]>"]
 name = "rfcbot-rs"
 version = "0.1.0"
+edition = "2018"
 
+# Sorted by alphanumeric order
 [dependencies]
 dotenv = "0.13.0"
 env_logger = "0.4"
 hex = "0.3.2"
+itertools = "0.8.0"
 lazy_static = "1.2.0"
 log = "0.3.6"
+maplit = "1.0.1"
+reqwest = "0.9.12"
 rocket = "0.4.0"
 rocket_contrib = { version = "0.4.0", features = ["json", "handlebars_templates"] }
 rust-crypto = "0.2.36"
@@ -18,9 +23,6 @@ serde_json = "1.0"
 toml = "0.4"
 url = "1.4"
 urlencoded = "0.5"
-maplit = "1.0.1"
-itertools = "0.8.0"
-reqwest = "0.9.12"
 
 [dependencies.chrono]
 features = ["serde"]

rust-toolchain

@@ -1 +1 @@
-nightly-2019-02-22
+nightly-2019-04-26

src/config.rs

@@ -3,8 +3,8 @@
 use std::collections::BTreeMap;
 use std::env;
 
-pub const RFC_BOT_MENTION: &'static str = "@rfcbot";
-pub const GH_ORGS: [&'static str; 3] = ["rust-lang", "rust-lang-nursery", "rust-lang-deprecated"];
+pub const RFC_BOT_MENTION: &str = "@rfcbot";
+pub const GH_ORGS: [&str; 3] = ["rust-lang", "rust-lang-nursery", "rust-lang-deprecated"];
 
 lazy_static! {
     pub static ref CONFIG: Config = {
@@ -40,30 +40,30 @@ impl Config {
     }
 }
 
-const DB_URL: &'static str = "DATABASE_URL";
-const DB_POOL_SIZE: &'static str = "DATABASE_POOL_SIZE";
-const GITHUB_TOKEN: &'static str = "GITHUB_ACCESS_TOKEN";
-const GITHUB_WEBHOOK_SECRETS: &'static str = "GITHUB_WEBHOOK_SECRETS";
-const GITHUB_UA: &'static str = "GITHUB_USER_AGENT";
-const GITHUB_INTERVAL: &'static str = "GITHUB_SCRAPE_INTERVAL";
-const POST_COMMENTS: &'static str = "POST_COMMENTS";
+const DB_URL: &str = "DATABASE_URL";
+const DB_POOL_SIZE: &str = "DATABASE_POOL_SIZE";
+const GITHUB_TOKEN: &str = "GITHUB_ACCESS_TOKEN";
+const GITHUB_WEBHOOK_SECRETS: &str = "GITHUB_WEBHOOK_SECRETS";
+const GITHUB_UA: &str = "GITHUB_USER_AGENT";
+const GITHUB_INTERVAL: &str = "GITHUB_SCRAPE_INTERVAL";
+const POST_COMMENTS: &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,
-    ];
-
-    for var in keys {
+    ]
+    .iter()
+    .for_each(|var| {
         vars.insert(var, env::var(var));
-    }
+    });
 
     let all_found = vars.iter().all(|(_, v)| v.is_ok());
     if all_found {
@@ -92,13 +92,13 @@ 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,
+            db_url,
+            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,
+            post_comments,
         })
     } else {
         Err(vars

src/domain/github.rs

@@ -95,7 +95,7 @@ pub struct IssuePartial {
 impl IssuePartial {
     pub fn complete(self, id: i32) -> Issue {
         Issue {
-            id: id,
+            id,
             number: self.number,
             fk_milestone: self.fk_milestone,
             fk_user: self.fk_user,

src/error.rs

@@ -1,12 +1,9 @@
 // Copyright 2016 Adam Perry. Dual-licensed MIT and Apache 2.0 (see LICENSE files for details).
 
-use std;
 use std::convert::From;
 use std::io;
 
-use diesel;
 use rocket_contrib::templates::handlebars;
-use serde_json;
 
 pub type DashResult<T> = std::result::Result<T, DashError>;
 

src/github/client.rs

@@ -8,14 +8,13 @@ use std::u32;
 use chrono::{DateTime, Utc};
 use reqwest::{self, header::HeaderMap, Response, StatusCode};
 use serde::de::DeserializeOwned;
-use serde_json;
 
-use config::CONFIG;
-use domain::github::GitHubUser;
-use error::{DashError, DashResult};
-use github::models::{CommentFromJson, IssueFromJson, PullRequestFromJson, PullRequestUrls};
+use crate::config::CONFIG;
+use crate::domain::github::GitHubUser;
+use crate::error::{DashError, DashResult};
+use crate::github::models::{CommentFromJson, IssueFromJson, PullRequestFromJson, PullRequestUrls};
 
-pub const BASE_URL: &'static str = "https://api.github.com";
+pub const BASE_URL: &str = "https://api.github.com";
 
 pub const DELAY: u64 = 300;
 
@@ -129,7 +128,7 @@ impl Client {
         if let Some(lh) = h.get("Link") {
             let lh = &lh.to_str().unwrap();
             for link in (**lh).split(',').map(|s| s.trim()) {
-                let tokens = link.split(';').map(|s| s.trim()).collect::<Vec<_>>();
+                let tokens = link.split(';').map(str::trim).collect::<Vec<_>>();
 
                 if tokens.len() != 2 {
                     continue;

src/github/command.rs

@@ -1,9 +1,9 @@
 use std::collections::BTreeSet;
 use std::fmt;
 
-use config::RFC_BOT_MENTION;
-use error::{DashError, DashResult};
-use teams::{RfcbotConfig, TeamLabel};
+use crate::config::RFC_BOT_MENTION;
+use crate::error::{DashError, DashResult};
+use crate::teams::{RfcbotConfig, TeamLabel};
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash)]
 pub enum Label {
@@ -34,7 +34,7 @@ impl Label {
 }
 
 impl fmt::Display for Label {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt.write_str(self.as_str()) }
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.write_str(self.as_str()) }
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
@@ -44,9 +44,9 @@ pub enum FcpDisposition {
     Postpone,
 }
 
-const FCP_REPR_MERGE: &'static str = "merge";
-const FCP_REPR_CLOSE: &'static str = "close";
-const FCP_REPR_POSTPONE: &'static str = "postpone";
+const FCP_REPR_MERGE: &str = "merge";
+const FCP_REPR_CLOSE: &str = "close";
+const FCP_REPR_POSTPONE: &str = "postpone";
 
 impl FcpDisposition {
     pub fn repr(self) -> &'static str {
@@ -268,7 +268,7 @@ impl<'a> RfcBotCommand<'a> {
         // Get the tokens for each command line (starts with a bot mention)
         command
             .lines()
-            .map(|l| l.trim())
+            .map(str::trim)
             .filter(|&l| l.starts_with(RFC_BOT_MENTION))
             .map(move |l| from_invocation_line(setup, l))
             .filter_map(Result::ok)
@@ -278,7 +278,7 @@ impl<'a> RfcBotCommand<'a> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use teams::test::TEST_SETUP;
+    use crate::teams::test::TEST_SETUP;
 
     fn parse_commands(body: &str) -> impl Iterator<Item = RfcBotCommand<'_>> {
         RfcBotCommand::from_str_all(&TEST_SETUP, body)

src/github/mod.rs

@@ -7,14 +7,13 @@ mod nag;
 pub mod webhooks;
 
 use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
-use diesel;
 use diesel::pg::PgConnection;
 use diesel::prelude::*;
 
-use domain::github::*;
-use domain::schema::*;
-use error::DashResult;
-use DB_POOL;
+use crate::domain::github::*;
+use crate::domain::schema::*;
+use crate::error::DashResult;
+use crate::DB_POOL;
 
 use self::client::Client;
 use self::models::{CommentFromJson, IssueFromJson, PullRequestFromJson};
@@ -34,7 +33,7 @@ pub fn most_recent_update() -> DashResult<DateTime<Utc>> {
     let conn = &*DB_POOL.get()?;
 
     let updated: NaiveDateTime = {
-        use domain::schema::githubsync::dsl::*;
+        use crate::domain::schema::githubsync::dsl::*;
         githubsync
             .select(ran_at)
             .filter(successful.eq(true))
@@ -49,7 +48,7 @@ pub fn most_recent_update() -> DashResult<DateTime<Utc>> {
 pub fn record_successful_update(ingest_start: NaiveDateTime) -> DashResult<()> {
     let conn = &*DB_POOL.get()?;
     // insert a successful sync record
-    use domain::schema::githubsync::dsl::*;
+    use crate::domain::schema::githubsync::dsl::*;
     let sync_record = GitHubSyncPartial {
         successful: true,
         ran_at: ingest_start,
@@ -122,7 +121,7 @@ pub fn ingest_since(repo: &str, start: DateTime<Utc>) -> DashResult<()> {
 }
 
 pub fn handle_pr(conn: &PgConnection, pr: PullRequestFromJson, repo: &str) -> DashResult<()> {
-    use domain::schema::pullrequest::dsl::*;
+    use crate::domain::schema::pullrequest::dsl::*;
     if let Some(ref assignee) = pr.assignee {
         handle_user(conn, assignee)?;
     }
@@ -191,7 +190,7 @@ pub fn handle_issue(conn: &PgConnection, issue: IssueFromJson, repo: &str) -> Da
 
     // handle issue itself
     {
-        use domain::schema::issue::dsl::*;
+        use crate::domain::schema::issue::dsl::*;
 
         diesel::insert_into(issue)
             .values(&i)
@@ -221,10 +220,10 @@ mod tests {
 
     #[test]
     fn test_handle_user() {
-        ::utils::setup_test_env();
+        crate::utils::setup_test_env();
         let db_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
-        let conn =
-            PgConnection::establish(&db_url).expect(&format!("Error connecting to {}", db_url));
+        let conn = PgConnection::establish(&db_url)
+            .unwrap_or_else(|_| panic!("Error connecting to {}", db_url));
 
         let user = GitHubUser {
             id: -1,

src/github/models.rs

@@ -5,9 +5,9 @@ use std::i32;
 
 use chrono::{DateTime, Utc};
 
-use domain::github::{GitHubUser, IssueComment, IssuePartial, Milestone, PullRequest};
-use error::DashResult;
-use DB_POOL;
+use crate::domain::github::{GitHubUser, IssueComment, IssuePartial, Milestone, PullRequest};
+use crate::error::DashResult;
+use crate::DB_POOL;
 
 #[derive(Clone, Debug, Deserialize)]
 pub struct MilestoneFromJson {
@@ -113,14 +113,14 @@ pub struct CommentFromJson {
 
 impl CommentFromJson {
     pub fn with_repo(self, repo: &str) -> DashResult<IssueComment> {
+        use crate::domain::schema::issue::dsl::*;
         use diesel::prelude::*;
-        use domain::schema::issue::dsl::*;
 
         let issue_number = self
             .html_url
             .split('#')
             .next()
-            .map(|r| r.split('/').last().map(|n| n.parse::<i32>()));
+            .map(|r| r.split('/').last().map(str::parse));
 
         let issue_number = match issue_number {
             Some(Some(Ok(n))) => n,