Skip to content

Commit 5619bd0

Browse files
james7132james7132
authored
Replace bevy_log's tracing reexport with bevy_utils' (#12254)
# 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.
1 parent 0d172b2 commit 5619bd0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+47
-55
lines changed

‎crates/bevy_animation/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ keywords = ["bevy"]
1313
bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
1414
bevy_asset = { path = "../bevy_asset", version = "0.14.0-dev" }
1515
bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
16-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
1716
bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
1817
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [
1918
"bevy",

‎crates/bevy_animation/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ use bevy_core::Name;
1414
use bevy_ecs::entity::MapEntities;
1515
use bevy_ecs::prelude::*;
1616
use bevy_ecs::reflect::ReflectMapEntities;
17-
use bevy_log::error;
1817
use bevy_math::{FloatExt, Quat, Vec3};
1918
use bevy_reflect::Reflect;
2019
use bevy_render::mesh::morph::MorphWeights;
2120
use bevy_time::Time;
2221
use bevy_transform::{prelude::Transform, TransformSystem};
2322
use bevy_utils::hashbrown::HashMap;
24-
use bevy_utils::{NoOpHash, Uuid};
23+
use bevy_utils::{tracing::error, NoOpHash, Uuid};
2524
use sha1_smol::Sha1;
2625

2726
#[allow(missing_docs)]

‎crates/bevy_asset/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ watch = []
2121
bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
2222
bevy_asset_macros = { path = "macros", version = "0.14.0-dev" }
2323
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
24-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
2524
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" }
2625
bevy_tasks = { path = "../bevy_tasks", version = "0.14.0-dev" }
2726
bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }
@@ -53,6 +52,7 @@ notify-debouncer-full = { version = "0.3.1", optional = true }
5352

5453
[dev-dependencies]
5554
bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
55+
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
5656

5757
[lints]
5858
workspace = true

‎crates/bevy_asset/src/io/android.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::io::{
22
get_meta_path, AssetReader, AssetReaderError, EmptyPathStream, PathStream, Reader, VecReader,
33
};
4-
use bevy_log::error;
4+
use bevy_utils::tracing::error;
55
use bevy_utils::BoxedFuture;
66
use std::{ffi::CString, path::Path};
77

‎crates/bevy_asset/src/io/embedded/embedded_watcher.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::io::{
33
memory::Dir,
44
AssetSourceEvent, AssetWatcher,
55
};
6-
use bevy_log::warn;
6+
use bevy_utils::tracing::warn;
77
use bevy_utils::{Duration, HashMap};
88
use notify_debouncer_full::{notify::RecommendedWatcher, Debouncer, FileIdMap};
99
use parking_lot::RwLock;

‎crates/bevy_asset/src/io/file/file_watcher.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::io::{AssetSourceEvent, AssetWatcher};
22
use crate::path::normalize_path;
3-
use bevy_log::error;
3+
use bevy_utils::tracing::error;
44
use bevy_utils::Duration;
55
use crossbeam_channel::Sender;
66
use notify_debouncer_full::{

‎crates/bevy_asset/src/io/file/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mod file_asset;
66
#[cfg(not(feature = "multi-threaded"))]
77
mod sync_file_asset;
88

9-
use bevy_log::error;
9+
use bevy_utils::tracing::error;
1010
#[cfg(feature = "file_watcher")]
1111
pub use file_watcher::*;
1212

‎crates/bevy_asset/src/io/processor_gated.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::{
44
AssetPath,
55
};
66
use async_lock::RwLockReadGuardArc;
7-
use bevy_log::trace;
7+
use bevy_utils::tracing::trace;
88
use bevy_utils::BoxedFuture;
99
use futures_io::AsyncRead;
1010
use std::{path::Path, pin::Pin, sync::Arc};

‎crates/bevy_asset/src/io/source.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{
66
processor::AssetProcessorData,
77
};
88
use bevy_ecs::system::Resource;
9-
use bevy_log::{error, warn};
9+
use bevy_utils::tracing::{error, warn};
1010
use bevy_utils::{CowArc, Duration, HashMap};
1111
use std::{fmt::Display, hash::Hash, sync::Arc};
1212
use thiserror::Error;

‎crates/bevy_asset/src/io/wasm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::io::{
22
get_meta_path, AssetReader, AssetReaderError, EmptyPathStream, PathStream, Reader, VecReader,
33
};
4-
use bevy_log::error;
4+
use bevy_utils::tracing::error;
55
use bevy_utils::BoxedFuture;
66
use js_sys::{Uint8Array, JSON};
77
use std::path::{Path, PathBuf};

‎crates/bevy_asset/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ use bevy_ecs::{
5555
system::Resource,
5656
world::FromWorld,
5757
};
58-
use bevy_log::error;
5958
use bevy_reflect::{FromReflect, GetTypeRegistration, Reflect, TypePath};
60-
use bevy_utils::HashSet;
59+
use bevy_utils::{tracing::error, HashSet};
6160
use std::{any::TypeId, sync::Arc};
6261

6362
#[cfg(all(feature = "file_watcher", not(feature = "multi-threaded")))]

‎crates/bevy_asset/src/meta.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{self as bevy_asset, DeserializeMetaError, VisitAssetDependencies};
22
use crate::{loader::AssetLoader, processor::Process, Asset, AssetPath};
3-
use bevy_log::error;
3+
use bevy_utils::tracing::error;
44
use downcast_rs::{impl_downcast, Downcast};
55
use ron::ser::PrettyConfig;
66
use serde::{Deserialize, Serialize};

‎crates/bevy_asset/src/processor/log.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::AssetPath;
22
use async_fs::File;
3-
use bevy_log::error;
3+
use bevy_utils::tracing::error;
44
use bevy_utils::HashSet;
55
use futures_lite::{AsyncReadExt, AsyncWriteExt};
66
use std::path::PathBuf;

‎crates/bevy_asset/src/processor/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use crate::{
1717
MissingAssetLoaderForExtensionError,
1818
};
1919
use bevy_ecs::prelude::*;
20-
use bevy_log::{debug, error, trace, warn};
2120
use bevy_tasks::IoTaskPool;
21+
use bevy_utils::tracing::{debug, error, trace, warn};
2222
use bevy_utils::{BoxedFuture, HashMap, HashSet};
2323
use futures_io::ErrorKind;
2424
use futures_lite::{AsyncReadExt, AsyncWriteExt, StreamExt};

‎crates/bevy_asset/src/server/info.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{
55
UntypedAssetId, UntypedHandle,
66
};
77
use bevy_ecs::world::World;
8-
use bevy_log::warn;
8+
use bevy_utils::tracing::warn;
99
use bevy_utils::{Entry, HashMap, HashSet, TypeIdMap};
1010
use crossbeam_channel::Sender;
1111
use std::{

‎crates/bevy_asset/src/server/loaders.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use crate::{
33
path::AssetPath,
44
};
55
use async_broadcast::RecvError;
6-
use bevy_log::{error, warn};
76
use bevy_tasks::IoTaskPool;
7+
use bevy_utils::tracing::{error, warn};
88
use bevy_utils::{HashMap, TypeIdMap};
99
use std::{any::TypeId, sync::Arc};
1010
use thiserror::Error;

‎crates/bevy_asset/src/server/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use crate::{
1818
UntypedAssetLoadFailedEvent, UntypedHandle,
1919
};
2020
use bevy_ecs::prelude::*;
21-
use bevy_log::{error, info};
2221
use bevy_tasks::IoTaskPool;
22+
use bevy_utils::tracing::{error, info};
2323
use bevy_utils::{CowArc, HashSet};
2424
use crossbeam_channel::{Receiver, Sender};
2525
use futures_lite::StreamExt;

‎crates/bevy_core_pipeline/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
2727
bevy_color = { path = "../bevy_color", version = "0.14.0-dev" }
2828
bevy_derive = { path = "../bevy_derive", version = "0.14.0-dev" }
2929
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
30-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
3130
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" }
3231
bevy_render = { path = "../bevy_render", version = "0.14.0-dev" }
3332
bevy_transform = { path = "../bevy_transform", version = "0.14.0-dev" }

‎crates/bevy_core_pipeline/src/tonemapping/mod.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ use bevy_render::renderer::RenderDevice;
1414
use bevy_render::texture::{CompressedImageFormats, Image, ImageSampler, ImageType};
1515
use bevy_render::view::{ViewTarget, ViewUniform};
1616
use bevy_render::{render_resource::*, Render, RenderApp, RenderSet};
17+
#[cfg(not(feature = "tonemapping_luts"))]
18+
use bevy_utils::tracing::error;
1719

1820
mod node;
1921

@@ -199,7 +201,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
199201
Tonemapping::AcesFitted => shader_defs.push("TONEMAP_METHOD_ACES_FITTED".into()),
200202
Tonemapping::AgX => {
201203
#[cfg(not(feature = "tonemapping_luts"))]
202-
bevy_log::error!(
204+
error!(
203205
"AgX tonemapping requires the `tonemapping_luts` feature.
204206
Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended),
205207
or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`."
@@ -211,7 +213,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
211213
}
212214
Tonemapping::TonyMcMapface => {
213215
#[cfg(not(feature = "tonemapping_luts"))]
214-
bevy_log::error!(
216+
error!(
215217
"TonyMcMapFace tonemapping requires the `tonemapping_luts` feature.
216218
Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended),
217219
or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`."
@@ -220,7 +222,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
220222
}
221223
Tonemapping::BlenderFilmic => {
222224
#[cfg(not(feature = "tonemapping_luts"))]
223-
bevy_log::error!(
225+
error!(
224226
"BlenderFilmic tonemapping requires the `tonemapping_luts` feature.
225227
Either enable the `tonemapping_luts` feature for bevy in `Cargo.toml` (recommended),
226228
or use a different `Tonemapping` method in your `Camera2dBundle`/`Camera3dBundle`."

‎crates/bevy_diagnostic/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ features = []
1919
bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
2020
bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
2121
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
22-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
2322
bevy_time = { path = "../bevy_time", version = "0.14.0-dev" }
2423
bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }
2524

‎crates/bevy_diagnostic/src/log_diagnostics_plugin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use super::{Diagnostic, DiagnosticPath, DiagnosticsStore};
22
use bevy_app::prelude::*;
33
use bevy_ecs::prelude::*;
4-
use bevy_log::{debug, info};
54
use bevy_time::{Real, Time, Timer, TimerMode};
5+
use bevy_utils::tracing::{debug, info};
66
use bevy_utils::Duration;
77

88
/// An App Plugin that logs diagnostics to the console.

‎crates/bevy_diagnostic/src/system_information_diagnostics_plugin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl SystemInformationDiagnosticsPlugin {
4040
))]
4141
pub mod internal {
4242
use bevy_ecs::{prelude::ResMut, system::Local};
43-
use bevy_log::info;
43+
use bevy_utils::tracing::info;
4444
use sysinfo::{CpuRefreshKind, MemoryRefreshKind, RefreshKind, System};
4545

4646
use crate::{Diagnostic, Diagnostics, DiagnosticsStore};
@@ -136,7 +136,7 @@ pub mod internal {
136136
)))]
137137
pub mod internal {
138138
pub(crate) fn setup_system() {
139-
bevy_log::warn!("This platform and/or configuration is not supported!");
139+
bevy_utils::tracing::warn!("This platform and/or configuration is not supported!");
140140
}
141141

142142
pub(crate) fn diagnostic_system() {

‎crates/bevy_gilrs/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ keywords = ["bevy"]
1313
bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
1414
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
1515
bevy_input = { path = "../bevy_input", version = "0.14.0-dev" }
16-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
1716
bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }
1817
bevy_time = { path = "../bevy_time", version = "0.14.0-dev" }
1918

‎crates/bevy_gilrs/src/rumble.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use bevy_ecs::prelude::{EventReader, Res, ResMut, Resource};
44
#[cfg(target_arch = "wasm32")]
55
use bevy_ecs::system::NonSendMut;
66
use bevy_input::gamepad::{GamepadRumbleIntensity, GamepadRumbleRequest};
7-
use bevy_log::{debug, warn};
87
use bevy_time::{Real, Time};
8+
use bevy_utils::tracing::{debug, warn};
99
use bevy_utils::{synccell::SyncCell, Duration, HashMap};
1010
use gilrs::{
1111
ff::{self, BaseEffect, BaseEffectType, Repeat, Replay},

‎crates/bevy_gizmos/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
2727
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev" }
2828
bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.14.0-dev" }
2929
bevy_transform = { path = "../bevy_transform", version = "0.14.0-dev" }
30-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
3130
bevy_gizmos_macros = { path = "macros", version = "0.14.0-dev" }
3231

3332
[lints]

‎crates/bevy_gizmos/src/lib.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ impl Plugin for GizmoPlugin {
9696
fn build(&self, app: &mut bevy_app::App) {
9797
// Gizmos cannot work without either a 3D or 2D renderer.
9898
#[cfg(all(not(feature = "bevy_pbr"), not(feature = "bevy_sprite")))]
99-
bevy_log::error!("bevy_gizmos requires either bevy_pbr or bevy_sprite. Please enable one.");
99+
bevy_utils::tracing::error!(
100+
"bevy_gizmos requires either bevy_pbr or bevy_sprite. Please enable one."
101+
);
100102

101103
load_internal_asset!(app, LINE_SHADER_HANDLE, "lines.wgsl", Shader::from_wgsl);
102104

‎crates/bevy_gltf/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
2222
bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.14.0-dev" }
2323
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
2424
bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" }
25-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
2625
bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
2726
bevy_pbr = { path = "../bevy_pbr", version = "0.14.0-dev" }
2827
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [

‎crates/bevy_gltf/src/loader.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use bevy_core_pipeline::prelude::Camera3dBundle;
99
use bevy_ecs::entity::EntityHashMap;
1010
use bevy_ecs::{entity::Entity, world::World};
1111
use bevy_hierarchy::{BuildWorldChildren, WorldChildBuilder};
12-
use bevy_log::{error, info_span, warn};
1312
use bevy_math::{Affine2, Mat4, Vec3};
1413
use bevy_pbr::{
1514
DirectionalLight, DirectionalLightBundle, PbrBundle, PointLight, PointLightBundle, SpotLight,
@@ -36,6 +35,7 @@ use bevy_scene::Scene;
3635
#[cfg(not(target_arch = "wasm32"))]
3736
use bevy_tasks::IoTaskPool;
3837
use bevy_transform::components::Transform;
38+
use bevy_utils::tracing::{error, info_span, warn};
3939
use bevy_utils::{
4040
smallvec::{smallvec, SmallVec},
4141
HashMap, HashSet,
@@ -474,9 +474,9 @@ async fn load_gltf<'a, 'b, 'c>(
474474
let vertex_count_after = mesh.count_vertices();
475475

476476
if vertex_count_before != vertex_count_after {
477-
bevy_log::debug!("Missing vertex normals in indexed geometry, computing them as flat. Vertex count increased from {} to {}", vertex_count_before, vertex_count_after);
477+
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);
478478
} else {
479-
bevy_log::debug!(
479+
bevy_utils::tracing::debug!(
480480
"Missing vertex normals in indexed geometry, computing them as flat."
481481
);
482482
}
@@ -490,7 +490,7 @@ async fn load_gltf<'a, 'b, 'c>(
490490
} else if mesh.attribute(Mesh::ATTRIBUTE_NORMAL).is_some()
491491
&& primitive.material().normal_texture().is_some()
492492
{
493-
bevy_log::debug!(
493+
bevy_utils::tracing::debug!(
494494
"Missing vertex tangents for {}, computing them using the mikktspace algorithm. Consider using a tool such as Blender to pre-compute the tangents.", file_name
495495
);
496496

‎crates/bevy_hierarchy/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ keywords = ["bevy"]
1111
[features]
1212
default = ["bevy_app"]
1313
trace = []
14-
bevy_app = ["reflect", "dep:bevy_app", "bevy_core", "bevy_log"]
14+
bevy_app = ["reflect", "dep:bevy_app", "bevy_core"]
1515
reflect = ["bevy_ecs/bevy_reflect", "bevy_reflect"]
1616

1717
[dependencies]
1818
# bevy
1919
bevy_app = { path = "../bevy_app", version = "0.14.0-dev", optional = true }
2020
bevy_core = { path = "../bevy_core", version = "0.14.0-dev", optional = true }
2121
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev", default-features = false }
22-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev", optional = true }
2322
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [
2423
"bevy",
2524
], optional = true }

‎crates/bevy_hierarchy/src/valid_parent_check_plugin.rs

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

‎crates/bevy_render/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ bevy_derive = { path = "../bevy_derive", version = "0.14.0-dev" }
4646
bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" }
4747
bevy_encase_derive = { path = "../bevy_encase_derive", version = "0.14.0-dev" }
4848
bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" }
49-
bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
5049
bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
5150
bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.14.0-dev" }
5251
bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [

‎crates/bevy_render/src/camera/camera.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ use bevy_ecs::{
2020
reflect::ReflectComponent,
2121
system::{Commands, Query, Res, ResMut, Resource},
2222
};
23-
use bevy_log::warn;
2423
use bevy_math::{vec2, Dir3, Mat4, Ray3d, Rect, URect, UVec2, UVec4, Vec2, Vec3};
2524
use bevy_reflect::prelude::*;
2625
use bevy_render_macros::ExtractComponent;
2726
use bevy_transform::components::GlobalTransform;
27+
use bevy_utils::tracing::warn;
2828
use bevy_utils::{HashMap, HashSet};
2929
use bevy_window::{
3030
NormalizedWindowRef, PrimaryWindow, Window, WindowCreated, WindowRef, WindowResized,

‎crates/bevy_render/src/extract_resource.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub fn extract_resource<R: ExtractResource>(
5151
} else {
5252
#[cfg(debug_assertions)]
5353
if !main_resource.is_added() {
54-
bevy_log::warn_once!(
54+
bevy_utils::warn_once!(
5555
"Removing resource {} from render world not expected, adding using `Commands`.
5656
This may decrease performance",
5757
std::any::type_name::<R>()

‎crates/bevy_render/src/mesh/mesh/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ use bevy_ecs::system::{
1717
lifetimeless::{SRes, SResMut},
1818
SystemParamItem,
1919
};
20-
use bevy_log::warn;
2120
use bevy_math::*;
2221
use bevy_reflect::Reflect;
2322
use bevy_utils::tracing::error;
23+
use bevy_utils::tracing::warn;
2424
use std::{collections::BTreeMap, hash::Hash, iter::FusedIterator};
2525
use thiserror::Error;
2626
use wgpu::{

0 commit comments

Comments
 (0)