Move macros to newly published tiny_bail

benfrankel · Aug 1, 2024 · e87fe9a · e87fe9a
1 parent c6ad8bb
commit e87fe9a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 102 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -64,6 +64,7 @@ ron = "0.8"
 serde = "1"
 strum = { version = "0.26", features = ["derive"] }
 tap = "1"
+tiny_bail = "0.1"
 tracing = { version = "0.1", features = [
     "max_level_debug",
     "release_max_level_warn",

diff --git a/src/util.rs b/src/util.rs
@@ -4,13 +4,14 @@
 
 pub mod config;
 pub mod late_despawn;
-pub mod macros;
 pub mod patch;
 pub mod selection;
 pub mod texture_atlas_grid;
 pub mod time;
 
 pub mod prelude {
+    pub use tiny_bail::prelude::*;
+
     pub use super::config::Config;
     pub use super::config::ConfigHandle;
     pub use super::config::ConfigRef;
@@ -27,10 +28,6 @@ pub mod prelude {
     pub use super::patch::WorldSpawnWithExt as _;
     pub use super::selection::Selection;
     pub use super::texture_atlas_grid::TextureAtlasGrid;
-    pub use crate::c;
-    pub use crate::cq;
-    pub use crate::r;
-    pub use crate::rq;
 }
 
 use bevy::prelude::*;

diff --git a/src/util/macros.rs b/src/util/macros.rs