Skip to content

Commit

Permalink
Remove thiserror from bevy_app (#15779)
Browse files Browse the repository at this point in the history
# Objective

- Contributes to #15460

## Solution

- Removed `thiserror` from `bevy_app`
  • Loading branch information
bushrat011899 authored Oct 9, 2024
1 parent 814f8ec commit 1be0ed3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion crates/bevy_app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ bevy_tasks = { path = "../bevy_tasks", version = "0.15.0-dev" }

# other
downcast-rs = "1.2.0"
thiserror = "1.0"
derive_more = { version = "1", default-features = false, features = [
"error",
"from",
"display",
] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
ctrlc = "3.4.4"
Expand Down
6 changes: 3 additions & 3 deletions crates/bevy_app/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ use bevy_ecs::{
use bevy_utils::tracing::info_span;
use bevy_utils::{tracing::debug, HashMap};
use core::{fmt::Debug, num::NonZero, panic::AssertUnwindSafe};
use derive_more::derive::{Display, Error};
use std::{
panic::{catch_unwind, resume_unwind},
process::{ExitCode, Termination},
};
use thiserror::Error;

bevy_ecs::define_label!(
/// A strongly-typed class of labels used to identify an [`App`].
Expand All @@ -32,9 +32,9 @@ pub use bevy_ecs::label::DynEq;
/// A shorthand for `Interned<dyn AppLabel>`.
pub type InternedAppLabel = Interned<dyn AppLabel>;

#[derive(Debug, Error)]
#[derive(Debug, Error, Display)]
pub(crate) enum AppError {
#[error("duplicate plugin {plugin_name:?}")]
#[display("duplicate plugin {plugin_name:?}")]
DuplicatePlugin { plugin_name: String },
}

Expand Down

0 comments on commit 1be0ed3

Please sign in to comment.