Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 04:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove thiserror from bevy_app (#15779)

Browse source 
# Objective

- Contributes to #15460

## Solution

- Removed `thiserror` from `bevy_app`
This commit is contained in:
Zachary Harrold 2024-10-10 01:17:52 +11:00 committed by GitHub
parent 814f8ec039
commit 1be0ed33fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/bevy_app/Cargo.toml
View file

@ -29,7 +29,11 @@ bevy_tasks = { path = "../bevy_tasks", version = "0.15.0-dev" }
# other # other
downcast-rs = "1.2.0" 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] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
ctrlc = "3.4.4" ctrlc = "3.4.4"

6
crates/bevy_app/src/app.rs
View file

@ -15,11 +15,11 @@ use bevy_ecs::{
use bevy_utils::tracing::info_span; use bevy_utils::tracing::info_span;
use bevy_utils::{tracing::debug, HashMap}; use bevy_utils::{tracing::debug, HashMap};
use core::{fmt::Debug, num::NonZero, panic::AssertUnwindSafe}; use core::{fmt::Debug, num::NonZero, panic::AssertUnwindSafe};
use derive_more::derive::{Display, Error};
use std::{ use std::{
panic::{catch_unwind, resume_unwind}, panic::{catch_unwind, resume_unwind},
process::{ExitCode, Termination}, process::{ExitCode, Termination},
}; };
use thiserror::Error;
bevy_ecs::define_label!( bevy_ecs::define_label!(
/// A strongly-typed class of labels used to identify an [`App`]. /// A strongly-typed class of labels used to identify an [`App`].
@ -32,9 +32,9 @@ pub use bevy_ecs::label::DynEq;
/// A shorthand for `Interned<dyn AppLabel>`. /// A shorthand for `Interned<dyn AppLabel>`.
pub type InternedAppLabel = Interned<dyn AppLabel>; pub type InternedAppLabel = Interned<dyn AppLabel>;
#[derive(Debug, Error)] #[derive(Debug, Error, Display)]
pub(crate) enum AppError { pub(crate) enum AppError {
#[error("duplicate plugin {plugin_name:?}")] #[display("duplicate plugin {plugin_name:?}")]
DuplicatePlugin { plugin_name: String }, DuplicatePlugin { plugin_name: String },
} }