From 887d71932fa656a9ff01b27b70ff13be579454c4 Mon Sep 17 00:00:00 2001 From: technetos Date: Thu, 22 Aug 2019 14:32:29 -0400 Subject: [PATCH] cargo fmt --- src/api.rs | 2 +- src/cache.rs | 8 ++++++-- src/db.rs | 4 +--- src/schema.rs | 6 +----- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/api.rs b/src/api.rs index 3794a99..3f4e61c 100644 --- a/src/api.rs +++ b/src/api.rs @@ -1,5 +1,5 @@ use crate::{ - cache::RoleIdCache, + cache::RoleIdCache, commands::{Args, Result}, }; use serenity::model::prelude::*; diff --git a/src/cache.rs b/src/cache.rs index d61f748..b865b75 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -4,7 +4,7 @@ use crate::{ schema::{messages, roles}, }; use diesel::prelude::*; -use serenity::{model::prelude::*}; +use serenity::model::prelude::*; pub(crate) struct MessageCache; @@ -94,7 +94,11 @@ pub(crate) fn save_or_update_role(name: &str, role: RoleId) -> Result<()> { Ok(()) } -pub(crate) fn save_or_update_message(name: &str, message: MessageId, channel: ChannelId) -> Result<()> { +pub(crate) fn save_or_update_message( + name: &str, + message: MessageId, + channel: ChannelId, +) -> Result<()> { match MessageCache::get_by_name(name)? { Some((id, _name, msg, chan)) => { if msg != message.0.to_string() || chan != channel.0.to_string() { diff --git a/src/db.rs b/src/db.rs index 09ea645..c7abe12 100644 --- a/src/db.rs +++ b/src/db.rs @@ -2,9 +2,7 @@ use crate::commands::Result; use diesel::prelude::*; pub(crate) fn database_connection() -> Result { - Ok(PgConnection::establish(&std::env::var( - "DATABASE_URL", - )?)?) + Ok(PgConnection::establish(&std::env::var("DATABASE_URL")?)?) } pub(crate) fn run_migrations() -> Result<()> { diff --git a/src/schema.rs b/src/schema.rs index 5f27c00..00b6d49 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -23,8 +23,4 @@ table! { } } -allow_tables_to_appear_in_same_query!( - messages, - roles, - tags, -); +allow_tables_to_appear_in_same_query!(messages, roles, tags,);