From 12be51078f24cca0f7ceccb0885d1e60a0ae2148 Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Mon, 24 Sep 2018 08:12:00 -0400 Subject: roll back to edition 2015 for editor support --- src/main.rs | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index baf1e06..24f35a7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,26 +1,47 @@ #![feature(transpose_result)] +#![feature(crate_in_paths)] -#[macro_use] extern crate lazy_static; -#[macro_use] extern crate log; +extern crate chrono; +#[cfg(feature = "diesel")] +#[macro_use] extern crate diesel; +extern crate dotenv; #[macro_use] extern crate dotenv_codegen; +extern crate either; #[macro_use] extern crate failure; +extern crate fern; +#[macro_use] extern crate lazy_static; +#[macro_use] extern crate log; +extern crate rand; +extern crate regex; +extern crate serenity; +extern crate sha1; +extern crate typemap; +extern crate url; -use self::commands::register_commands; use dotenv::dotenv; -use serenity::framework::standard::help_commands; -use serenity::framework::StandardFramework; -use serenity::model::gateway::Ready; -use serenity::model::id::{GuildId, UserId}; -use serenity::prelude::*; -use std::{env, thread}; -use std::time::{Duration, Instant}; - use failure::Error; - +use self::commands::register_commands; pub use self::util::*; +use serenity::{ + framework::{ + standard::help_commands, + StandardFramework, + }, + model::{ + gateway::Ready, + id::{GuildId, UserId}, + }, + prelude::*, +}; +use std::{ + env, + thread, + time::{ + Duration, + Instant + }, +}; -#[cfg(feature = "diesel")] -#[macro_use] extern crate diesel; #[cfg(feature = "diesel")] mod db; -- cgit v1.3.1