diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml index b2b037e19edda..5f4dd5480522b 100644 --- a/crates/bevy_gilrs/Cargo.toml +++ b/crates/bevy_gilrs/Cargo.toml @@ -18,7 +18,11 @@ bevy_time = { path = "../bevy_time", version = "0.15.0-dev" } # other gilrs = "0.11.0" -thiserror = "1.0" +derive_more = { version = "1", default-features = false, features = [ + "error", + "from", + "display", +] } [lints] workspace = true diff --git a/crates/bevy_gilrs/src/rumble.rs b/crates/bevy_gilrs/src/rumble.rs index 62c6b0dc7d639..a4466e49aec86 100644 --- a/crates/bevy_gilrs/src/rumble.rs +++ b/crates/bevy_gilrs/src/rumble.rs @@ -10,11 +10,11 @@ use bevy_utils::{ tracing::{debug, warn}, Duration, HashMap, }; +use derive_more::derive::{Display, Error, From}; use gilrs::{ ff::{self, BaseEffect, BaseEffectType, Repeat, Replay}, GamepadId, }; -use thiserror::Error; /// A rumble effect that is currently in effect. struct RunningRumble { @@ -27,12 +27,12 @@ struct RunningRumble { effect: SyncCell, } -#[derive(Error, Debug)] +#[derive(Error, Display, Debug, From)] enum RumbleError { - #[error("gamepad not found")] + #[display("gamepad not found")] GamepadNotFound, - #[error("gilrs error while rumbling gamepad: {0}")] - GilrsError(#[from] ff::Error), + #[display("gilrs error while rumbling gamepad: {_0}")] + GilrsError(ff::Error), } /// Contains the gilrs rumble effects that are currently running for each gamepad