use newer eyre directly

6 files changed, 11 insertions, 11 deletions

diff --git a/src/handlers/error.rs b/src/handlers/error.rs
index 4bca032..afd1241 100644
--- a/src/handlers/error.rs
+++ b/src/handlers/error.rs
@@ -1,7 +1,7 @@
 use crate::colors::Colors;
 use crate::Data;
 
-use color_eyre::eyre::Report;
+use eyre::Report;
 use log::error;
 use poise::serenity_prelude::{CreateEmbed, Timestamp};
 use poise::{CreateReply, FrameworkError};
diff --git a/src/handlers/event/guild.rs b/src/handlers/event/guild.rs
index f8bd306..51ae3b7 100644
--- a/src/handlers/event/guild.rs
+++ b/src/handlers/event/guild.rs
@@ -1,4 +1,4 @@
-use color_eyre::eyre::Result;
+use eyre::Result;
 use log::{debug, warn};
 use poise::serenity_prelude::{Guild, UnavailableGuild};
 
diff --git a/src/handlers/event/message.rs b/src/handlers/event/message.rs
index 946e596..3054e27 100644
--- a/src/handlers/event/message.rs
+++ b/src/handlers/event/message.rs
@@ -1,6 +1,6 @@
 use crate::{consts, Data};
 
-use color_eyre::eyre::{eyre, Report, Result};
+use eyre::{eyre, Report, Result};
 use log::debug;
 use poise::serenity_prelude::{Context, Message};
 use poise::FrameworkContext;
diff --git a/src/handlers/event/mod.rs b/src/handlers/event/mod.rs
index 50a19d5..9c986e1 100644
--- a/src/handlers/event/mod.rs
+++ b/src/handlers/event/mod.rs
@@ -1,6 +1,6 @@
 use crate::Data;
 
-use color_eyre::eyre::{Report, Result};
+use eyre::{Report, Result};
 use log::info;
 use poise::serenity_prelude as serenity;
 use poise::FrameworkContext;
diff --git a/src/handlers/event/pinboard.rs b/src/handlers/event/pinboard.rs
index 1db14b6..be10eac 100644
--- a/src/handlers/event/pinboard.rs
+++ b/src/handlers/event/pinboard.rs
@@ -1,6 +1,6 @@
 use crate::{utils, Data};
 
-use color_eyre::eyre::{eyre, Context as _, Result};
+use eyre::{eyre, Context as _, OptionExt as _, Result};
 use log::debug;
 use poise::serenity_prelude::{
 	ChannelId, Context, CreateAllowedMentions, CreateMessage, Message, MessageType, User,
@@ -38,15 +38,15 @@ pub async fn handle(ctx: &Context, message: &Message, data: &Data) -> Result<()>
 	let reference_id = message
 		.clone()
 		.message_reference
-		.ok_or_else(|| eyre!("Couldn't get referenced message of pin!"))?
+		.ok_or_eyre("Couldn't get referenced message of pin!")?
 		.message_id
-		.ok_or_else(|| eyre!("Couldn't get id of referenced message of pin!"))?;
+		.ok_or_eyre("Couldn't get id of referenced message of pin!")?;
 
 	let pins = message
 		.channel_id
 		.pins(ctx)
 		.await
-		.wrap_err_with(|| "Couldn't get a list of pins!?")?;
+		.wrap_err("Couldn't get a list of pins!?")?;
 
 	let pin = pins
 		.iter()
@@ -70,7 +70,7 @@ async fn redirect(ctx: &Context, pin: &Message, pinner: &User, target: ChannelId
 	target
 		.send_message(&ctx.http, message)
 		.await
-		.wrap_err_with(|| "Couldn't redirect message")?;
+		.wrap_err("Couldn't redirect message")?;
 
 	Ok(())
 }
diff --git a/src/handlers/event/reactboard.rs b/src/handlers/event/reactboard.rs
index 17deeb0..4316633 100644
--- a/src/handlers/event/reactboard.rs
+++ b/src/handlers/event/reactboard.rs
@@ -1,7 +1,7 @@
 use crate::{storage, utils, Data};
 use storage::ReactBoardEntry;
 
-use color_eyre::eyre::{eyre, Context as _, Result};
+use eyre::{eyre, Context as _, Result};
 use log::debug;
 use poise::serenity_prelude::{
 	Context, CreateMessage, EditMessage, GuildId, Message, MessageReaction, Reaction,
@@ -11,7 +11,7 @@ pub async fn handle(ctx: &Context, reaction: &Reaction, data: &Data) -> Result<(
 	let msg = reaction
 		.message(&ctx.http)
 		.await
-		.wrap_err_with(|| "Couldn't get reaction from message!")?;
+		.wrap_err("Couldn't get reaction from message!")?;
 
 	let matched = msg
 		.clone()