diff options
author | Vincent Ambo <mail@tazj.in> | 2020-08-01T23·26+0100 |
---|---|---|
committer | tazjin <mail@tazj.in> | 2020-08-02T02·16+0000 |
commit | 194c498d53ed68a9c70d548008e60eb7bdcbd59a (patch) | |
tree | 212947662db08737d228996b5ed707a172d8a618 /fun/paroxysm/src/main.rs | |
parent | 660a02947f91fd88901ee32e708f0004b45313ef (diff) |
refactor(paroxysm): Explicitly macro imports, no more 'extern crate' r/1542
Removes all but one occurence of `extern crate`, to conform with Rust 2018. The last one is necessary because Diesel is a giant jungle of complicated macros re-exported from private crates, and the current version makes it hard to import those directly instead. Change-Id: Id14165a456d5c3ce6f7a4e0222c611640113eb11 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1549 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'fun/paroxysm/src/main.rs')
-rw-r--r-- | fun/paroxysm/src/main.rs | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/fun/paroxysm/src/main.rs b/fun/paroxysm/src/main.rs index 510cf0461b89..a5382e9c0bd5 100644 --- a/fun/paroxysm/src/main.rs +++ b/fun/paroxysm/src/main.rs @@ -1,27 +1,16 @@ -extern crate irc; -extern crate serde; -#[macro_use] -extern crate serde_derive; -#[macro_use] -extern crate diesel; -extern crate chrono; -extern crate config; -extern crate env_logger; -#[macro_use] -extern crate log; -#[macro_use] -extern crate failure; -extern crate regex; -#[macro_use] -extern crate lazy_static; -extern crate rand; +// TODO(tazjin): Upgrade to a Diesel version with public derive +// macros. +#[macro_use] extern crate diesel; use crate::cfg::Config; use crate::keyword::KeywordDetails; use diesel::pg::PgConnection; use diesel::r2d2::{ConnectionManager, Pool}; use failure::Error; +use failure::format_err; use irc::client::prelude::*; +use lazy_static::lazy_static; +use log::{debug, info, warn}; use rand::rngs::ThreadRng; use rand::{thread_rng, Rng}; use regex::{Captures, Regex}; @@ -275,6 +264,7 @@ impl App { } pub fn handle_privmsg(&mut self, from: &str, chan: &str, msg: &str) -> Result<(), Error> { + // TODO(tazjin): Move these to the top. lazy_static! { static ref LEARN_RE: Regex = Regex::new(r#"^\?\?(?P<gen>!)?\s*(?P<subj>[^\[:]*):\s*(?P<val>.*)"#).unwrap(); |