diff options
Diffstat (limited to 'src/commands/optional')
| -rw-r--r-- | src/commands/optional/copypasta.rs | 6 | ||||
| -rw-r--r-- | src/commands/optional/mod.rs | 2 | ||||
| -rw-r--r-- | src/commands/optional/teawiespam.rs | 2 | ||||
| -rw-r--r-- | src/commands/optional/uwurandom.rs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/commands/optional/copypasta.rs b/src/commands/optional/copypasta.rs index b7e7365..15171f8 100644 --- a/src/commands/optional/copypasta.rs +++ b/src/commands/optional/copypasta.rs @@ -2,7 +2,7 @@ use crate::Context; use std::collections::HashMap; -use color_eyre::eyre::{eyre, Result}; +use eyre::{eyre, OptionExt, Result}; use include_dir::{include_dir, Dir}; use log::debug; @@ -43,11 +43,11 @@ fn get_copypasta(name: &Copypastas) -> Result<String> { .file_stem() .ok_or_else(|| eyre!("Couldn't get file stem from {file:#?}"))? .to_str() - .ok_or_else(|| eyre!("Couldn't convert file stem to str!"))?; + .ok_or_eyre("Couldn't convert file stem to str!")?; let contents = file .contents_utf8() - .ok_or_else(|| eyre!("Couldnt get contents from copypasta!"))?; + .ok_or_eyre("Couldnt get contents from copypasta!")?; // refer to files by their name w/o extension files.insert(name, contents); diff --git a/src/commands/optional/mod.rs b/src/commands/optional/mod.rs index 8ef7757..39abdcb 100644 --- a/src/commands/optional/mod.rs +++ b/src/commands/optional/mod.rs @@ -1,6 +1,6 @@ use crate::Data; -use color_eyre::eyre::Report; +use eyre::Report; use poise::Command; mod copypasta; diff --git a/src/commands/optional/teawiespam.rs b/src/commands/optional/teawiespam.rs index 1ec237e..7f7ba79 100644 --- a/src/commands/optional/teawiespam.rs +++ b/src/commands/optional/teawiespam.rs @@ -1,6 +1,6 @@ use crate::Context; -use color_eyre::eyre::Result; +use eyre::Result; use log::debug; /// teawie will spam you. diff --git a/src/commands/optional/uwurandom.rs b/src/commands/optional/uwurandom.rs index c8405a0..312e54f 100644 --- a/src/commands/optional/uwurandom.rs +++ b/src/commands/optional/uwurandom.rs @@ -1,6 +1,6 @@ use crate::Context; -use color_eyre::eyre::Result; +use eyre::Result; use log::debug; use rand::Rng; |
