Merge branch 'bevyengine:main' into main

crates/bevy_ecs/Cargo.toml

@@ -18,6 +18,7 @@ bevy_debug_stepping = []
 serialize = ["dep:serde"]
 track_change_detection = []
 reflect_functions = ["bevy_reflect", "bevy_reflect/functions"]
+detailed_trace = []
 
 [dependencies]
 bevy_ptr = { path = "../bevy_ptr", version = "0.15.0-dev" }

crates/bevy_internal/Cargo.toml

@@ -24,7 +24,7 @@ trace = [
 trace_chrome = ["bevy_log/tracing-chrome"]
 trace_tracy = ["bevy_render?/tracing-tracy", "bevy_log/tracing-tracy"]
 trace_tracy_memory = ["bevy_log/trace_tracy_memory"]
-detailed_trace = ["bevy_utils/detailed_trace"]
+detailed_trace = ["bevy_ecs/detailed_trace", "bevy_render?/detailed_trace"]
 
 sysinfo_plugin = ["bevy_diagnostic/sysinfo_plugin"]
 

crates/bevy_render/Cargo.toml

@@ -30,6 +30,7 @@ ci_limits = []
 webgl = ["wgpu/webgl"]
 webgpu = ["wgpu/webgpu"]
 ios_simulator = []
+detailed_trace = []
 
 [dependencies]
 # bevy

crates/bevy_utils/Cargo.toml

@@ -18,7 +18,6 @@ std = [
   "ahash/runtime-rng",
 ]
 alloc = ["hashbrown/default"]
-detailed_trace = []
 serde = ["hashbrown/serde"]
 
 [dependencies]

crates/bevy_utils/src/lib.rs

@@ -411,7 +411,7 @@ pub fn error<E: Debug>(result: Result<(), E>) {
 #[macro_export]
 macro_rules! detailed_trace {
     ($($tts:tt)*) => {
-        if cfg!(detailed_trace) {
+        if cfg!(feature = "detailed_trace") {
             $crate::tracing::trace!($($tts)*);
         }
     }