forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace bevy_log's tracing reexport with bevy_utils' (#12254)

Browse Source 
# Objective
Fixes #11298. Make the use of bevy_log vs bevy_utils::tracing more
consistent.

## Solution
Replace all uses of bevy_log's logging macros with the reexport from
bevy_utils. Remove bevy_log as a dependency where it's no longer needed
anymore.

Ideally we should just be using tracing directly, but given that all of
these crates are already using bevy_utils, this likely isn't that great
of a loss right now.
This commit is contained in:
James Liu 2024-03-02 10:38:04 -08:00 committed by GitHub
parent 0d172b2914
commit 5619bd09d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
46 changed files with 47 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/bevy_animation/Cargo.toml
View File

@ -13,7 +13,6 @@ keywords = ["bevy"]
bevy_app = { path = "../bevy_app", version = "0.14.0-dev" } bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
bevy_asset = { path = "../bevy_asset", version = "0.14.0-dev" } bevy_asset = { path = "../bevy_asset", version = "0.14.0-dev" }
bevy_core = { path = "../bevy_core", version = "0.14.0-dev" } bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.14.0-dev" } bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [ bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [
"bevy", "bevy",

3
crates/bevy_animation/src/lib.rs
View File

@ -14,14 +14,13 @@ use bevy_core::Name;
use bevy_ecs::entity::MapEntities; use bevy_ecs::entity::MapEntities;
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_ecs::reflect::ReflectMapEntities; use bevy_ecs::reflect::ReflectMapEntities;
use bevy_log::error;
use bevy_math::{FloatExt, Quat, Vec3}; use bevy_math::{FloatExt, Quat, Vec3};
use bevy_reflect::Reflect; use bevy_reflect::Reflect;
use bevy_render::mesh::morph::MorphWeights; use bevy_render::mesh::morph::MorphWeights;
use bevy_time::Time; use bevy_time::Time;
use bevy_transform::{prelude::Transform, TransformSystem}; use bevy_transform::{prelude::Transform, TransformSystem};
use bevy_utils::hashbrown::HashMap; use bevy_utils::hashbrown::HashMap;
use bevy_utils::{NoOpHash, Uuid}; use bevy_utils::{tracing::error, NoOpHash, Uuid};
use sha1_smol::Sha1; use sha1_smol::Sha1;
#[allow(missing_docs)] #[allow(missing_docs)]

2
crates/bevy_asset/Cargo.toml
View File

@ -21,7 +21,6 @@ watch = []
bevy_app = { path = "../bevy_app", version = "0.14.0-dev" } bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
bevy_asset_macros = { path = "macros", version = "0.14.0-dev" } bevy_asset_macros = { path = "macros", version = "0.14.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" } bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" }
bevy_tasks = { path = "../bevy_tasks", version = "0.14.0-dev" } bevy_tasks = { path = "../bevy_tasks", version = "0.14.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" } bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }
@ -53,6 +52,7 @@ notify-debouncer-full = { version = "0.3.1", optional = true }
[dev-dependencies] [dev-dependencies]
bevy_core = { path = "../bevy_core", version = "0.14.0-dev" } bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
[lints] [lints]
workspace = true workspace = true

2
crates/bevy_asset/src/io/android.rs
View File

@ -1,7 +1,7 @@
use crate::io::{ use crate::io::{
get_meta_path, AssetReader, AssetReaderError, EmptyPathStream, PathStream, Reader, VecReader, get_meta_path, AssetReader, AssetReaderError, EmptyPathStream, PathStream, Reader, VecReader,
}; };
use bevy_log::error; use bevy_utils::tracing::error;
use bevy_utils::BoxedFuture; use bevy_utils::BoxedFuture;
use std::{ffi::CString, path::Path}; use std::{ffi::CString, path::Path};

2
crates/bevy_asset/src/io/embedded/embedded_watcher.rs
View File

@ -3,7 +3,7 @@ use crate::io::{
memory::Dir, memory::Dir,
AssetSourceEvent, AssetWatcher, AssetSourceEvent, AssetWatcher,
}; };
use bevy_log::warn; use bevy_utils::tracing::warn;
use bevy_utils::{Duration, HashMap}; use bevy_utils::{Duration, HashMap};
use notify_debouncer_full::{notify::RecommendedWatcher, Debouncer, FileIdMap}; use notify_debouncer_full::{notify::RecommendedWatcher, Debouncer, FileIdMap};
use parking_lot::RwLock; use parking_lot::RwLock;

2
crates/bevy_asset/src/io/file/file_watcher.rs
View File

@ -1,6 +1,6 @@
use crate::io::{AssetSourceEvent, AssetWatcher}; use crate::io::{AssetSourceEvent, AssetWatcher};
use crate::path::normalize_path; use crate::path::normalize_path;
use bevy_log::error; use bevy_utils::tracing::error;
use bevy_utils::Duration; use bevy_utils::Duration;
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use notify_debouncer_full::{ use notify_debouncer_full::{

2
crates/bevy_asset/src/io/file/mod.rs
View File

@ -6,7 +6,7 @@ mod file_asset;
#[cfg(not(feature = "multi-threaded"))] #[cfg(not(feature = "multi-threaded"))]
mod sync_file_asset; mod sync_file_asset;
use bevy_log::error; use bevy_utils::tracing::error;
#[cfg(feature = "file_watcher")] #[cfg(feature = "file_watcher")]
pub use file_watcher::*; pub use file_watcher::*;

2
crates/bevy_asset/src/io/processor_gated.rs
View File

@ -4,7 +4,7 @@ use crate::{
AssetPath, AssetPath,
}; };
use async_lock::RwLockReadGuardArc; use async_lock::RwLockReadGuardArc;
use bevy_log::trace; use bevy_utils::tracing::trace;
use bevy_utils::BoxedFuture; use bevy_utils::BoxedFuture;
use futures_io::AsyncRead; use futures_io::AsyncRead;
use std::{path::Path, pin::Pin, sync::Arc}; use std::{path::Path, pin::Pin, sync::Arc};

2
crates/bevy_asset/src/io/source.rs
View File

@ -6,7 +6,7 @@ use crate::{
processor::AssetProcessorData, processor::AssetProcessorData,
}; };
use bevy_ecs::system::Resource; use bevy_ecs::system::Resource;
use bevy_log::{error, warn}; use bevy_utils::tracing::{error, warn};
use bevy_utils::{CowArc, Duration, HashMap}; use bevy_utils::{CowArc, Duration, HashMap};
use std::{fmt::Display, hash::Hash, sync::Arc}; use std::{fmt::Display, hash::Hash, sync::Arc};
use thiserror::Error; use thiserror::Error;

2
crates/bevy_asset/src/io/wasm.rs
View File

@ -1,7 +1,7 @@
use crate::io::{ use crate::io::{
get_meta_path, AssetReader, AssetReaderError, EmptyPathStream, PathStream, Reader, VecReader, get_meta_path, AssetReader, AssetReaderError, EmptyPathStream, PathStream, Reader, VecReader,
}; };
use bevy_log::error; use bevy_utils::tracing::error;
use bevy_utils::BoxedFuture; use bevy_utils::BoxedFuture;
use js_sys::{Uint8Array, JSON}; use js_sys::{Uint8Array, JSON};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};

3
crates/bevy_asset/src/lib.rs
View File

@ -55,9 +55,8 @@ use bevy_ecs::{
system::Resource, system::Resource,
world::FromWorld, world::FromWorld,
}; };
use bevy_log::error;
use bevy_reflect::{FromReflect, GetTypeRegistration, Reflect, TypePath}; use bevy_reflect::{FromReflect, GetTypeRegistration, Reflect, TypePath};
use bevy_utils::HashSet; use bevy_utils::{tracing::error, HashSet};
use std::{any::TypeId, sync::Arc}; use std::{any::TypeId, sync::Arc};
#[cfg(all(feature = "file_watcher", not(feature = "multi-threaded")))] #[cfg(all(feature = "file_watcher", not(feature = "multi-threaded")))]

2
crates/bevy_asset/src/meta.rs
View File

@ -1,6 +1,6 @@
use crate::{self as bevy_asset, DeserializeMetaError, VisitAssetDependencies}; use crate::{self as bevy_asset, DeserializeMetaError, VisitAssetDependencies};
use crate::{loader::AssetLoader, processor::Process, Asset, AssetPath}; use crate::{loader::AssetLoader, processor::Process, Asset, AssetPath};
use bevy_log::error; use bevy_utils::tracing::error;
use downcast_rs::{impl_downcast, Downcast}; use downcast_rs::{impl_downcast, Downcast};
use ron::ser::PrettyConfig; use ron::ser::PrettyConfig;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};

2
crates/bevy_asset/src/processor/log.rs
View File

@ -1,6 +1,6 @@
use crate::AssetPath; use crate::AssetPath;
use async_fs::File; use async_fs::File;
use bevy_log::error; use bevy_utils::tracing::error;
use bevy_utils::HashSet; use bevy_utils::HashSet;
use futures_lite::{AsyncReadExt, AsyncWriteExt}; use futures_lite::{AsyncReadExt, AsyncWriteExt};
use std::path::PathBuf; use std::path::PathBuf;

2
crates/bevy_asset/src/processor/mod.rs
View File

@ -17,8 +17,8 @@ use crate::{
MissingAssetLoaderForExtensionError, MissingAssetLoaderForExtensionError,
}; };
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_log::{debug, error, trace, warn};
use bevy_tasks::IoTaskPool; use bevy_tasks::IoTaskPool;
use bevy_utils::tracing::{debug, error, trace, warn};
use bevy_utils::{BoxedFuture, HashMap, HashSet}; use bevy_utils::{BoxedFuture, HashMap, HashSet};
use futures_io::ErrorKind; use futures_io::ErrorKind;
use futures_lite::{AsyncReadExt, AsyncWriteExt, StreamExt}; use futures_lite::{AsyncReadExt, AsyncWriteExt, StreamExt};

2
crates/bevy_asset/src/server/info.rs
View File

@ -5,7 +5,7 @@ use crate::{
UntypedAssetId, UntypedHandle, UntypedAssetId, UntypedHandle,
}; };
use bevy_ecs::world::World; use bevy_ecs::world::World;
use bevy_log::warn; use bevy_utils::tracing::warn;
use bevy_utils::{Entry, HashMap, HashSet, TypeIdMap}; use bevy_utils::{Entry, HashMap, HashSet, TypeIdMap};
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use std::{ use std::{

2
crates/bevy_asset/src/server/loaders.rs
View File

@ -3,8 +3,8 @@ use crate::{
path::AssetPath, path::AssetPath,
}; };
use async_broadcast::RecvError; use async_broadcast::RecvError;
use bevy_log::{error, warn};
use bevy_tasks::IoTaskPool; use bevy_tasks::IoTaskPool;
use bevy_utils::tracing::{error, warn};
use bevy_utils::{HashMap, TypeIdMap}; use bevy_utils::{HashMap, TypeIdMap};
use std::{any::TypeId, sync::Arc}; use std::{any::TypeId, sync::Arc};
use thiserror::Error; use thiserror::Error;

2
crates/bevy_asset/src/server/mod.rs
View File

@ -18,8 +18,8 @@ use crate::{
UntypedAssetLoadFailedEvent, UntypedHandle, UntypedAssetLoadFailedEvent, UntypedHandle,
}; };
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_log::{error, info};
use bevy_tasks::IoTaskPool; use bevy_tasks::IoTaskPool;
use bevy_utils::tracing::{error, info};
use bevy_utils::{CowArc, HashSet}; use bevy_utils::{CowArc, HashSet};
use crossbeam_channel::{Receiver, Sender}; use crossbeam_channel::{Receiver, Sender};
use futures_lite::StreamExt; use futures_lite::StreamExt;

1
crates/bevy_core_pipeline/Cargo.toml
View File

@ -27,7 +27,6 @@ bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
bevy_color = { path = "../bevy_color", version = "0.14.0-dev" } bevy_color = { path = "../bevy_color", version = "0.14.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.14.0-dev" } bevy_derive = { path = "../bevy_derive", version = "0.14.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" } bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" }
bevy_render = { path = "../bevy_render", version = "0.14.0-dev" } bevy_render = { path = "../bevy_render", version = "0.14.0-dev" }
bevy_transform = { path = "../bevy_transform", version = "0.14.0-dev" } bevy_transform = { path = "../bevy_transform", version = "0.14.0-dev" }

8
crates/bevy_core_pipeline/src/tonemapping/mod.rs
View File

@ -14,6 +14,8 @@ use bevy_render::renderer::RenderDevice;
use bevy_render::texture::{CompressedImageFormats, Image, ImageSampler, ImageType}; use bevy_render::texture::{CompressedImageFormats, Image, ImageSampler, ImageType};
use bevy_render::view::{ViewTarget, ViewUniform}; use bevy_render::view::{ViewTarget, ViewUniform};
use bevy_render::{render_resource::*, Render, RenderApp, RenderSet}; use bevy_render::{render_resource::*, Render, RenderApp, RenderSet};
#[cfg(not(feature = "tonemapping_luts"))]
use bevy_utils::tracing::error;
mod node; mod node;
@ -199,7 +201,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
Tonemapping::AcesFitted => shader_defs.push("TONEMAP_METHOD_ACES_FITTED".into()), Tonemapping::AcesFitted => shader_defs.push("TONEMAP_METHOD_ACES_FITTED".into()),
Tonemapping::AgX => { Tonemapping::AgX => {
#[cfg(not(feature = "tonemapping_luts"))] #[cfg(not(feature = "tonemapping_luts"))]
bevy_log::error!( error!(
"AgX tonemapping requires the `tonemapping_luts` feature. "AgX tonemapping requires the `tonemapping_luts` feature.
Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended), Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended),
or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`." or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`."
@ -211,7 +213,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
} }
Tonemapping::TonyMcMapface => { Tonemapping::TonyMcMapface => {
#[cfg(not(feature = "tonemapping_luts"))] #[cfg(not(feature = "tonemapping_luts"))]
bevy_log::error!( error!(
"TonyMcMapFace tonemapping requires the `tonemapping_luts` feature. "TonyMcMapFace tonemapping requires the `tonemapping_luts` feature.
Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended), Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended),
or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`." or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`."
@ -220,7 +222,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
} }
Tonemapping::BlenderFilmic => { Tonemapping::BlenderFilmic => {
#[cfg(not(feature = "tonemapping_luts"))] #[cfg(not(feature = "tonemapping_luts"))]
bevy_log::error!( error!(
"BlenderFilmic tonemapping requires the `tonemapping_luts` feature. "BlenderFilmic tonemapping requires the `tonemapping_luts` feature.
Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended), Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended),
or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`." or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`."

1
crates/bevy_diagnostic/Cargo.toml
View File

@ -19,7 +19,6 @@ features = []
bevy_app = { path = "../bevy_app", version = "0.14.0-dev" } bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
bevy_core = { path = "../bevy_core", version = "0.14.0-dev" } bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_time = { path = "../bevy_time", version = "0.14.0-dev" } bevy_time = { path = "../bevy_time", version = "0.14.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" } bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }

2
crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
View File

@ -1,8 +1,8 @@
use super::{Diagnostic, DiagnosticPath, DiagnosticsStore}; use super::{Diagnostic, DiagnosticPath, DiagnosticsStore};
use bevy_app::prelude::*; use bevy_app::prelude::*;
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_log::{debug, info};
use bevy_time::{Real, Time, Timer, TimerMode}; use bevy_time::{Real, Time, Timer, TimerMode};
use bevy_utils::tracing::{debug, info};
use bevy_utils::Duration; use bevy_utils::Duration;
/// An App Plugin that logs diagnostics to the console. /// An App Plugin that logs diagnostics to the console.

4
crates/bevy_diagnostic/src/system_information_diagnostics_plugin.rs
View File

@ -40,7 +40,7 @@ impl SystemInformationDiagnosticsPlugin {
))] ))]
pub mod internal { pub mod internal {
use bevy_ecs::{prelude::ResMut, system::Local}; use bevy_ecs::{prelude::ResMut, system::Local};
use bevy_log::info; use bevy_utils::tracing::info;
use sysinfo::{CpuRefreshKind, MemoryRefreshKind, RefreshKind, System}; use sysinfo::{CpuRefreshKind, MemoryRefreshKind, RefreshKind, System};
use crate::{Diagnostic, Diagnostics, DiagnosticsStore}; use crate::{Diagnostic, Diagnostics, DiagnosticsStore};
@ -136,7 +136,7 @@ pub mod internal {
)))] )))]
pub mod internal { pub mod internal {
pub(crate) fn setup_system() { pub(crate) fn setup_system() {
bevy_log::warn!("This platform and/or configuration is not supported!"); bevy_utils::tracing::warn!("This platform and/or configuration is not supported!");
} }
pub(crate) fn diagnostic_system() { pub(crate) fn diagnostic_system() {

1
crates/bevy_gilrs/Cargo.toml
View File

@ -13,7 +13,6 @@ keywords = ["bevy"]
bevy_app = { path = "../bevy_app", version = "0.14.0-dev" } bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
bevy_input = { path = "../bevy_input", version = "0.14.0-dev" } bevy_input = { path = "../bevy_input", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" } bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }
bevy_time = { path = "../bevy_time", version = "0.14.0-dev" } bevy_time = { path = "../bevy_time", version = "0.14.0-dev" }

2
crates/bevy_gilrs/src/rumble.rs
View File

@ -4,8 +4,8 @@ use bevy_ecs::prelude::{EventReader, Res, ResMut, Resource};
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
use bevy_ecs::system::NonSendMut; use bevy_ecs::system::NonSendMut;
use bevy_input::gamepad::{GamepadRumbleIntensity, GamepadRumbleRequest}; use bevy_input::gamepad::{GamepadRumbleIntensity, GamepadRumbleRequest};
use bevy_log::{debug, warn};
use bevy_time::{Real, Time}; use bevy_time::{Real, Time};
use bevy_utils::tracing::{debug, warn};
use bevy_utils::{synccell::SyncCell, Duration, HashMap}; use bevy_utils::{synccell::SyncCell, Duration, HashMap};
use gilrs::{ use gilrs::{
ff::{self, BaseEffect, BaseEffectType, Repeat, Replay}, ff::{self, BaseEffect, BaseEffectType, Repeat, Replay},

1
crates/bevy_gizmos/Cargo.toml
View File

@ -27,7 +27,6 @@ bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" } bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" }
bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.14.0-dev" } bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.14.0-dev" }
bevy_transform = { path = "../bevy_transform", version = "0.14.0-dev" } bevy_transform = { path = "../bevy_transform", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_gizmos_macros = { path = "macros", version = "0.14.0-dev" } bevy_gizmos_macros = { path = "macros", version = "0.14.0-dev" }
[lints] [lints]

4
crates/bevy_gizmos/src/lib.rs
View File

@ -96,7 +96,9 @@ impl Plugin for GizmoPlugin {
fn build(&self, app: &mut bevy_app::App) { fn build(&self, app: &mut bevy_app::App) {
// Gizmos cannot work without either a 3D or 2D renderer. // Gizmos cannot work without either a 3D or 2D renderer.
#[cfg(all(not(feature = "bevy_pbr"), not(feature = "bevy_sprite")))] #[cfg(all(not(feature = "bevy_pbr"), not(feature = "bevy_sprite")))]
bevy_log::error!("bevy_gizmos requires either bevy_pbr or bevy_sprite. Please enable one."); bevy_utils::tracing::error!(
"bevy_gizmos requires either bevy_pbr or bevy_sprite. Please enable one."
);
load_internal_asset!(app, LINE_SHADER_HANDLE, "lines.wgsl", Shader::from_wgsl); load_internal_asset!(app, LINE_SHADER_HANDLE, "lines.wgsl", Shader::from_wgsl);

1
crates/bevy_gltf/Cargo.toml
View File

@ -22,7 +22,6 @@ bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.14.0-dev" } bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.14.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" } bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.14.0-dev" } bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
bevy_pbr = { path = "../bevy_pbr", version = "0.14.0-dev" } bevy_pbr = { path = "../bevy_pbr", version = "0.14.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [ bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [

8
crates/bevy_gltf/src/loader.rs
View File

@ -9,7 +9,6 @@ use bevy_core_pipeline::prelude::Camera3dBundle;
use bevy_ecs::entity::EntityHashMap; use bevy_ecs::entity::EntityHashMap;
use bevy_ecs::{entity::Entity, world::World}; use bevy_ecs::{entity::Entity, world::World};
use bevy_hierarchy::{BuildWorldChildren, WorldChildBuilder}; use bevy_hierarchy::{BuildWorldChildren, WorldChildBuilder};
use bevy_log::{error, info_span, warn};
use bevy_math::{Affine2, Mat4, Vec3}; use bevy_math::{Affine2, Mat4, Vec3};
use bevy_pbr::{ use bevy_pbr::{
DirectionalLight, DirectionalLightBundle, PbrBundle, PointLight, PointLightBundle, SpotLight, DirectionalLight, DirectionalLightBundle, PbrBundle, PointLight, PointLightBundle, SpotLight,
@ -36,6 +35,7 @@ use bevy_scene::Scene;
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
use bevy_tasks::IoTaskPool; use bevy_tasks::IoTaskPool;
use bevy_transform::components::Transform; use bevy_transform::components::Transform;
use bevy_utils::tracing::{error, info_span, warn};
use bevy_utils::{ use bevy_utils::{
smallvec::{smallvec, SmallVec}, smallvec::{smallvec, SmallVec},
HashMap, HashSet, HashMap, HashSet,
@ -474,9 +474,9 @@ async fn load_gltf<'a, 'b, 'c>(
let vertex_count_after = mesh.count_vertices(); let vertex_count_after = mesh.count_vertices();
if vertex_count_before != vertex_count_after { if vertex_count_before != vertex_count_after {
bevy_log::debug!("Missing vertex normals in indexed geometry, computing them as flat. Vertex count increased from {} to {}", vertex_count_before, vertex_count_after); bevy_utils::tracing::debug!("Missing vertex normals in indexed geometry, computing them as flat. Vertex count increased from {} to {}", vertex_count_before, vertex_count_after);
} else { } else {
bevy_log::debug!( bevy_utils::tracing::debug!(
"Missing vertex normals in indexed geometry, computing them as flat." "Missing vertex normals in indexed geometry, computing them as flat."
); );
} }
@ -490,7 +490,7 @@ async fn load_gltf<'a, 'b, 'c>(
} else if mesh.attribute(Mesh::ATTRIBUTE_NORMAL).is_some() } else if mesh.attribute(Mesh::ATTRIBUTE_NORMAL).is_some()
&& primitive.material().normal_texture().is_some() && primitive.material().normal_texture().is_some()
{ {
bevy_log::debug!( bevy_utils::tracing::debug!(
"Missing vertex tangents for {}, computing them using the mikktspace algorithm. Consider using a tool such as Blender to pre-compute the tangents.", file_name "Missing vertex tangents for {}, computing them using the mikktspace algorithm. Consider using a tool such as Blender to pre-compute the tangents.", file_name
); );

3
crates/bevy_hierarchy/Cargo.toml
View File

@ -11,7 +11,7 @@ keywords = ["bevy"]
[features] [features]
default = ["bevy_app"] default = ["bevy_app"]
trace = [] trace = []
bevy_app = ["reflect", "dep:bevy_app", "bevy_core", "bevy_log"] bevy_app = ["reflect", "dep:bevy_app", "bevy_core"]
reflect = ["bevy_ecs/bevy_reflect", "bevy_reflect"] reflect = ["bevy_ecs/bevy_reflect", "bevy_reflect"]
[dependencies] [dependencies]
@ -19,7 +19,6 @@ reflect = ["bevy_ecs/bevy_reflect", "bevy_reflect"]
bevy_app = { path = "../bevy_app", version = "0.14.0-dev", optional = true } bevy_app = { path = "../bevy_app", version = "0.14.0-dev", optional = true }
bevy_core = { path = "../bevy_core", version = "0.14.0-dev", optional = true } bevy_core = { path = "../bevy_core", version = "0.14.0-dev", optional = true }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev", default-features = false } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev", default-features = false }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev", optional = true }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [ bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [
"bevy", "bevy",
], optional = true } ], optional = true }

2
crates/bevy_hierarchy/src/valid_parent_check_plugin.rs
View File

@ -64,7 +64,7 @@ pub fn check_hierarchy_component_has_valid_parent<T: Component>(
let parent = parent.get(); let parent = parent.get();
if !component_query.contains(parent) && !already_diagnosed.contains(&entity) { if !component_query.contains(parent) && !already_diagnosed.contains(&entity) {
already_diagnosed.insert(entity); already_diagnosed.insert(entity);
bevy_log::warn!( bevy_utils::tracing::warn!(
"warning[B0004]: {name} with the {ty_name} component has a parent without {ty_name}.\n\ "warning[B0004]: {name} with the {ty_name} component has a parent without {ty_name}.\n\
This will cause inconsistent behaviors! See: https://bevyengine.org/learn/errors/#b0004", This will cause inconsistent behaviors! See: https://bevyengine.org/learn/errors/#b0004",
ty_name = get_short_name(std::any::type_name::<T>()), ty_name = get_short_name(std::any::type_name::<T>()),

1
crates/bevy_render/Cargo.toml
View File

@ -46,7 +46,6 @@ bevy_derive = { path = "../bevy_derive", version = "0.14.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
bevy_encase_derive = { path = "../bevy_encase_derive", version = "0.14.0-dev" } bevy_encase_derive = { path = "../bevy_encase_derive", version = "0.14.0-dev" }
bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" } bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.14.0-dev" } bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.14.0-dev" } bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.14.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [ bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [

2
crates/bevy_render/src/camera/camera.rs
View File

@ -20,11 +20,11 @@ use bevy_ecs::{
reflect::ReflectComponent, reflect::ReflectComponent,
system::{Commands, Query, Res, ResMut, Resource}, system::{Commands, Query, Res, ResMut, Resource},
}; };
use bevy_log::warn;
use bevy_math::{vec2, Dir3, Mat4, Ray3d, Rect, URect, UVec2, UVec4, Vec2, Vec3}; use bevy_math::{vec2, Dir3, Mat4, Ray3d, Rect, URect, UVec2, UVec4, Vec2, Vec3};
use bevy_reflect::prelude::*; use bevy_reflect::prelude::*;
use bevy_render_macros::ExtractComponent; use bevy_render_macros::ExtractComponent;
use bevy_transform::components::GlobalTransform; use bevy_transform::components::GlobalTransform;
use bevy_utils::tracing::warn;
use bevy_utils::{HashMap, HashSet}; use bevy_utils::{HashMap, HashSet};
use bevy_window::{ use bevy_window::{
NormalizedWindowRef, PrimaryWindow, Window, WindowCreated, WindowRef, WindowResized, NormalizedWindowRef, PrimaryWindow, Window, WindowCreated, WindowRef, WindowResized,

2
crates/bevy_render/src/extract_resource.rs
View File

@ -51,7 +51,7 @@ pub fn extract_resource<R: ExtractResource>(
} else { } else {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
if !main_resource.is_added() { if !main_resource.is_added() {
bevy_log::warn_once!( bevy_utils::warn_once!(
"Removing resource {} from render world not expected, adding using `Commands`. "Removing resource {} from render world not expected, adding using `Commands`.
This may decrease performance", This may decrease performance",
std::any::type_name::<R>() std::any::type_name::<R>()

2
crates/bevy_render/src/mesh/mesh/mod.rs
View File

@ -17,10 +17,10 @@ use bevy_ecs::system::{
lifetimeless::{SRes, SResMut}, lifetimeless::{SRes, SResMut},
SystemParamItem, SystemParamItem,
}; };
use bevy_log::warn;
use bevy_math::*; use bevy_math::*;
use bevy_reflect::Reflect; use bevy_reflect::Reflect;
use bevy_utils::tracing::error; use bevy_utils::tracing::error;
use bevy_utils::tracing::warn;
use std::{collections::BTreeMap, hash::Hash, iter::FusedIterator}; use std::{collections::BTreeMap, hash::Hash, iter::FusedIterator};
use thiserror::Error; use thiserror::Error;
use wgpu::{ use wgpu::{

2
crates/bevy_render/src/render_graph/app.rs
View File

@ -1,6 +1,6 @@
use bevy_app::App; use bevy_app::App;
use bevy_ecs::world::FromWorld; use bevy_ecs::world::FromWorld;
use bevy_log::warn; use bevy_utils::tracing::warn;
use super::{IntoRenderNodeArray, Node, RenderGraph, RenderLabel, RenderSubGraph}; use super::{IntoRenderNodeArray, Node, RenderGraph, RenderLabel, RenderSubGraph};

2
crates/bevy_render/src/render_resource/bind_group_layout_entries.rs
View File

@ -222,7 +222,7 @@ impl IntoBindGroupLayoutEntryBuilder for BindingType {
impl IntoBindGroupLayoutEntryBuilder for BindGroupLayoutEntry { impl IntoBindGroupLayoutEntryBuilder for BindGroupLayoutEntry {
fn into_bind_group_layout_entry_builder(self) -> BindGroupLayoutEntryBuilder { fn into_bind_group_layout_entry_builder(self) -> BindGroupLayoutEntryBuilder {
if self.binding != u32::MAX { if self.binding != u32::MAX {
bevy_log::warn!("The BindGroupLayoutEntries api ignores the binding index when converting a raw wgpu::BindGroupLayoutEntry. You can ignore this warning by setting it to u32::MAX."); bevy_utils::tracing::warn!("The BindGroupLayoutEntries api ignores the binding index when converting a raw wgpu::BindGroupLayoutEntry. You can ignore this warning by setting it to u32::MAX.");
} }
BindGroupLayoutEntryBuilder { BindGroupLayoutEntryBuilder {
ty: self.ty, ty: self.ty,

2
crates/bevy_render/src/view/window/mod.rs
View File

@ -276,7 +276,7 @@ pub fn prepare_windows(
format!("MSAA {}x", fallback.samples()) format!("MSAA {}x", fallback.samples())
}; };
bevy_log::warn!( bevy_utils::tracing::warn!(
"MSAA {}x is not supported on this device. Falling back to {}.", "MSAA {}x is not supported on this device. Falling back to {}.",
msaa.samples(), msaa.samples(),
fallback_str, fallback_str,

2
crates/bevy_render/src/view/window/screenshot.rs
View File

@ -3,8 +3,8 @@ use std::{borrow::Cow, path::Path, sync::PoisonError};
use bevy_app::Plugin; use bevy_app::Plugin;
use bevy_asset::{load_internal_asset, Handle}; use bevy_asset::{load_internal_asset, Handle};
use bevy_ecs::{entity::EntityHashMap, prelude::*}; use bevy_ecs::{entity::EntityHashMap, prelude::*};
use bevy_log::{error, info, info_span};
use bevy_tasks::AsyncComputeTaskPool; use bevy_tasks::AsyncComputeTaskPool;
use bevy_utils::tracing::{error, info, info_span};
use std::sync::Mutex; use std::sync::Mutex;
use thiserror::Error; use thiserror::Error;
use wgpu::{ use wgpu::{

1
crates/bevy_sprite/Cargo.toml
View File

@ -19,7 +19,6 @@ bevy_asset = { path = "../bevy_asset", version = "0.14.0-dev" }
bevy_color = { path = "../bevy_color", version = "0.14.0-dev" } bevy_color = { path = "../bevy_color", version = "0.14.0-dev" }
bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.14.0-dev" } bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.14.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.14.0-dev" } bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [ bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [
"bevy", "bevy",

2
crates/bevy_sprite/src/mesh2d/material.rs
View File

@ -10,7 +10,6 @@ use bevy_ecs::{
prelude::*, prelude::*,
system::{lifetimeless::SRes, SystemParamItem}, system::{lifetimeless::SRes, SystemParamItem},
}; };
use bevy_log::error;
use bevy_render::{ use bevy_render::{
mesh::{Mesh, MeshVertexBufferLayoutRef}, mesh::{Mesh, MeshVertexBufferLayoutRef},
prelude::Image, prelude::Image,
@ -30,6 +29,7 @@ use bevy_render::{
Extract, ExtractSchedule, Render, RenderApp, RenderSet, Extract, ExtractSchedule, Render, RenderApp, RenderSet,
}; };
use bevy_transform::components::{GlobalTransform, Transform}; use bevy_transform::components::{GlobalTransform, Transform};
use bevy_utils::tracing::error;
use bevy_utils::{FloatOrd, HashMap, HashSet}; use bevy_utils::{FloatOrd, HashMap, HashSet};
use std::hash::Hash; use std::hash::Hash;
use std::marker::PhantomData; use std::marker::PhantomData;

2
crates/bevy_sprite/src/texture_atlas_builder.rs
View File

@ -1,11 +1,11 @@
use bevy_asset::AssetId; use bevy_asset::AssetId;
use bevy_log::{debug, error, warn};
use bevy_math::{URect, UVec2}; use bevy_math::{URect, UVec2};
use bevy_render::{ use bevy_render::{
render_asset::RenderAssetUsages, render_asset::RenderAssetUsages,
render_resource::{Extent3d, TextureDimension, TextureFormat}, render_resource::{Extent3d, TextureDimension, TextureFormat},
texture::{Image, TextureFormatPixelInfo}, texture::{Image, TextureFormatPixelInfo},
}; };
use bevy_utils::tracing::{debug, error, warn};
use bevy_utils::HashMap; use bevy_utils::HashMap;
use rectangle_pack::{ use rectangle_pack::{
contains_smallest_box, pack_rects, volume_heuristic, GroupedRectsToPlace, PackedLocation, contains_smallest_box, pack_rects, volume_heuristic, GroupedRectsToPlace, PackedLocation,

2
crates/bevy_sprite/src/texture_slice/mod.rs
View File

@ -86,7 +86,7 @@ impl TextureSlice {
remaining_columns -= size_y; remaining_columns -= size_y;
} }
if slices.len() > 1_000 { if slices.len() > 1_000 {
bevy_log::warn!("One of your tiled textures has generated {} slices. You might want to use higher stretch values to avoid a great performance cost", slices.len()); bevy_utils::tracing::warn!("One of your tiled textures has generated {} slices. You might want to use higher stretch values to avoid a great performance cost", slices.len());
} }
slices slices
} }

2
crates/bevy_sprite/src/texture_slice/slicer.rs
View File

@ -207,7 +207,7 @@ impl TextureSlicer {
|| self.border.top >= rect_size.y || self.border.top >= rect_size.y
|| self.border.bottom >= rect_size.y || self.border.bottom >= rect_size.y
{ {
bevy_log::error!( bevy_utils::tracing::error!(
"TextureSlicer::border has out of bounds values. No slicing will be applied" "TextureSlicer::border has out of bounds values. No slicing will be applied"
); );
return vec![TextureSlice { return vec![TextureSlice {

1
crates/bevy_ui/Cargo.toml
View File

@ -19,7 +19,6 @@ bevy_derive = { path = "../bevy_derive", version = "0.14.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" } bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" }
bevy_input = { path = "../bevy_input", version = "0.14.0-dev" } bevy_input = { path = "../bevy_input", version = "0.14.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.14.0-dev" } bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [ bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [
"bevy", "bevy",

2
crates/bevy_ui/src/layout/debug.rs
View File

@ -25,7 +25,7 @@ pub fn print_ui_layout_tree(ui_surface: &UiSurface) {
&mut out, &mut out,
); );
} }
bevy_log::info!("Layout tree for camera entity: {entity:?}\n{out}"); bevy_utils::tracing::info!("Layout tree for camera entity: {entity:?}\n{out}");
} }
} }

2
crates/bevy_ui/src/layout/mod.rs
View File

@ -13,10 +13,10 @@ use bevy_ecs::{
world::Ref, world::Ref,
}; };
use bevy_hierarchy::{Children, Parent}; use bevy_hierarchy::{Children, Parent};
use bevy_log::warn;
use bevy_math::{UVec2, Vec2}; use bevy_math::{UVec2, Vec2};
use bevy_render::camera::{Camera, NormalizedRenderTarget}; use bevy_render::camera::{Camera, NormalizedRenderTarget};
use bevy_transform::components::Transform; use bevy_transform::components::Transform;
use bevy_utils::tracing::warn;
use bevy_utils::{default, HashMap, HashSet}; use bevy_utils::{default, HashMap, HashSet};
use bevy_window::{PrimaryWindow, Window, WindowScaleFactorChanged}; use bevy_window::{PrimaryWindow, Window, WindowScaleFactorChanged};
use std::fmt; use std::fmt;