From 3d07413690c551d9f034c93af85ae8da5a495e14 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 20 Apr 2024 02:31:40 +0000
Subject: spring cleaning (#165)

* treewide: lightly refactor everything

* once_cell -> std::sync

* remove build.rs

we can get our target at runtime

* commands::copypasta: refactor selection

* drop owo_colors

* reactboard: always remove author from count

* commands: better handle behavior outside of guilds

* ci: garnix -> gha

* nix: drop flake-parts & pre-commit-hooks

* nix: fix rust flags in derivation

* add gha badge to readme

* ci: fail when format changes are made

* ci: only run on push to main

* nix: fix nil script

* nix: add libiconv to darwin deps

* ci: disable fail-fast

* nix: fix actionlint & static checks

* ci: add release gates

* nix: fix nil check again

* ci: give release gates unique names

* ci: only build static packages in docker workflow

* nix: move dev outputs to subflake

* fix some typos

* nix: cleanup checks & dev shell

* add editorconfig
---
 src/handlers/error.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/handlers/error.rs')

diff --git a/src/handlers/error.rs b/src/handlers/error.rs
index afd1241..e706fec 100644
--- a/src/handlers/error.rs
+++ b/src/handlers/error.rs
@@ -1,12 +1,10 @@
-use crate::colors::Colors;
-use crate::Data;
+use crate::{consts::Colors, Data, Error};
 
-use eyre::Report;
 use log::error;
 use poise::serenity_prelude::{CreateEmbed, Timestamp};
 use poise::{CreateReply, FrameworkError};
 
-pub async fn handle(error: poise::FrameworkError<'_, Data, Report>) {
+pub async fn handle(error: poise::FrameworkError<'_, Data, Error>) {
 	match error {
 		FrameworkError::Setup {
 			error, framework, ..
@@ -46,7 +44,7 @@ pub async fn handle(error: poise::FrameworkError<'_, Data, Report>) {
 
 		error => {
 			if let Err(e) = poise::builtins::on_error(error).await {
-				error!("Unhandled error occured:\n{e:#?}");
+				error!("Unhandled error occurred:\n{e:#?}");
 			}
 		}
 	}
-- 
cgit v1.2.3