From 1b8c1c12429c18651f213bca6519dcaf376895a6 Mon Sep 17 00:00:00 2001 From: Benjamin Brienen Date: Thu, 19 Sep 2024 23:28:16 +0200 Subject: [PATCH] simplify std::mem references (#15315) # Objective - Fixes #15314 ## Solution - Remove unnecessary usings and simplify references to those functions. ## Testing CI --- Cargo.toml | 2 +- benches/benches/bevy_ecs/world/commands.rs | 2 -- crates/bevy_app/src/app.rs | 2 +- crates/bevy_asset/src/io/mod.rs | 1 - crates/bevy_ecs/src/entity/mod.rs | 1 - crates/bevy_ecs/src/storage/blob_vec.rs | 2 +- crates/bevy_ecs/src/world/mod.rs | 2 +- crates/bevy_pbr/src/meshlet/meshlet_mesh_manager.rs | 2 +- crates/bevy_pbr/src/meshlet/persistent_buffer_impls.rs | 2 +- crates/bevy_pbr/src/meshlet/resource_manager.rs | 1 - crates/bevy_pbr/src/render/mesh_bindings.rs | 1 - crates/bevy_pbr/src/render/morph.rs | 2 +- crates/bevy_ptr/src/lib.rs | 1 - crates/bevy_render/src/mesh/morph.rs | 2 +- crates/bevy_render/src/render_resource/buffer_vec.rs | 6 +++--- crates/bevy_render/src/view/visibility/mod.rs | 1 - examples/ecs/dynamic.rs | 4 ++-- examples/shader/custom_phase_item.rs | 1 - examples/shader/gpu_readback.rs | 1 - examples/shader/shader_instancing.rs | 1 - 20 files changed, 13 insertions(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0d6a58c118..5242ee4172 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"] license = "MIT OR Apache-2.0" repository = "https://github.com/bevyengine/bevy" documentation = "https://docs.rs/bevy" -rust-version = "1.79.0" +rust-version = "1.80.0" [workspace] exclude = [ diff --git a/benches/benches/bevy_ecs/world/commands.rs b/benches/benches/bevy_ecs/world/commands.rs index ad394065c1..6994d9b10f 100644 --- a/benches/benches/bevy_ecs/world/commands.rs +++ b/benches/benches/bevy_ecs/world/commands.rs @@ -1,5 +1,3 @@ -use std::mem::size_of; - use bevy_ecs::{ component::Component, entity::Entity, diff --git a/crates/bevy_app/src/app.rs b/crates/bevy_app/src/app.rs index da41efbc15..a6a0243ee3 100644 --- a/crates/bevy_app/src/app.rs +++ b/crates/bevy_app/src/app.rs @@ -1115,7 +1115,7 @@ impl Termination for AppExit { #[cfg(test)] mod tests { - use std::{iter, marker::PhantomData, mem::size_of, sync::Mutex}; + use std::{iter, marker::PhantomData, sync::Mutex}; use bevy_ecs::{ change_detection::{DetectChanges, ResMut}, diff --git a/crates/bevy_asset/src/io/mod.rs b/crates/bevy_asset/src/io/mod.rs index ca1802c34a..925192e6de 100644 --- a/crates/bevy_asset/src/io/mod.rs +++ b/crates/bevy_asset/src/io/mod.rs @@ -26,7 +26,6 @@ use futures_io::{AsyncRead, AsyncSeek, AsyncWrite}; use futures_lite::{ready, Stream}; use std::{ io::SeekFrom, - mem::size_of, path::{Path, PathBuf}, pin::Pin, sync::Arc, diff --git a/crates/bevy_ecs/src/entity/mod.rs b/crates/bevy_ecs/src/entity/mod.rs index 9182e6476b..24a6f3a672 100644 --- a/crates/bevy_ecs/src/entity/mod.rs +++ b/crates/bevy_ecs/src/entity/mod.rs @@ -1006,7 +1006,6 @@ impl EntityLocation { #[cfg(test)] mod tests { use super::*; - use std::mem::size_of; #[test] fn entity_niche_optimization() { diff --git a/crates/bevy_ecs/src/storage/blob_vec.rs b/crates/bevy_ecs/src/storage/blob_vec.rs index 9b695aa4b2..9d268944e9 100644 --- a/crates/bevy_ecs/src/storage/blob_vec.rs +++ b/crates/bevy_ecs/src/storage/blob_vec.rs @@ -505,7 +505,7 @@ mod tests { use crate::{component::Component, ptr::OwningPtr, world::World}; use super::BlobVec; - use std::{alloc::Layout, cell::RefCell, mem::align_of, rc::Rc}; + use std::{alloc::Layout, cell::RefCell, rc::Rc}; /// # Safety /// diff --git a/crates/bevy_ecs/src/world/mod.rs b/crates/bevy_ecs/src/world/mod.rs index 4bb30d1794..2c55062751 100644 --- a/crates/bevy_ecs/src/world/mod.rs +++ b/crates/bevy_ecs/src/world/mod.rs @@ -2502,7 +2502,7 @@ impl World { /// total += info.layout().size(); /// } /// println!("Total size: {} bytes", total); - /// # assert_eq!(total, std::mem::size_of::() + std::mem::size_of::()); + /// # assert_eq!(total, size_of::() + size_of::()); /// ``` /// /// ## Dynamically running closures for resources matching specific `TypeId`s diff --git a/crates/bevy_pbr/src/meshlet/meshlet_mesh_manager.rs b/crates/bevy_pbr/src/meshlet/meshlet_mesh_manager.rs index 03855ec039..7c25be7529 100644 --- a/crates/bevy_pbr/src/meshlet/meshlet_mesh_manager.rs +++ b/crates/bevy_pbr/src/meshlet/meshlet_mesh_manager.rs @@ -13,7 +13,7 @@ use bevy_render::{ renderer::{RenderDevice, RenderQueue}, }; use bevy_utils::HashMap; -use std::{mem::size_of, ops::Range, sync::Arc}; +use std::{ops::Range, sync::Arc}; /// Manages uploading [`MeshletMesh`] asset data to the GPU. #[derive(Resource)] diff --git a/crates/bevy_pbr/src/meshlet/persistent_buffer_impls.rs b/crates/bevy_pbr/src/meshlet/persistent_buffer_impls.rs index da341c285e..175fbe7514 100644 --- a/crates/bevy_pbr/src/meshlet/persistent_buffer_impls.rs +++ b/crates/bevy_pbr/src/meshlet/persistent_buffer_impls.rs @@ -2,7 +2,7 @@ use super::{ asset::{Meshlet, MeshletBoundingSpheres}, persistent_buffer::PersistentGpuBufferable, }; -use std::{mem::size_of, sync::Arc}; +use std::sync::Arc; const MESHLET_VERTEX_SIZE_IN_BYTES: u32 = 48; diff --git a/crates/bevy_pbr/src/meshlet/resource_manager.rs b/crates/bevy_pbr/src/meshlet/resource_manager.rs index 297987ef84..4df1fb8fd3 100644 --- a/crates/bevy_pbr/src/meshlet/resource_manager.rs +++ b/crates/bevy_pbr/src/meshlet/resource_manager.rs @@ -21,7 +21,6 @@ use binding_types::*; use encase::internal::WriteInto; use std::{ array, iter, - mem::size_of, sync::{atomic::AtomicBool, Arc}, }; diff --git a/crates/bevy_pbr/src/render/mesh_bindings.rs b/crates/bevy_pbr/src/render/mesh_bindings.rs index 4891588552..cda05314fb 100644 --- a/crates/bevy_pbr/src/render/mesh_bindings.rs +++ b/crates/bevy_pbr/src/render/mesh_bindings.rs @@ -4,7 +4,6 @@ use bevy_math::Mat4; use bevy_render::{ mesh::morph::MAX_MORPH_WEIGHTS, render_resource::*, renderer::RenderDevice, texture::GpuImage, }; -use std::mem::size_of; use crate::render::skin::MAX_JOINTS; diff --git a/crates/bevy_pbr/src/render/morph.rs b/crates/bevy_pbr/src/render/morph.rs index d3d43e9b69..2f28fbf588 100644 --- a/crates/bevy_pbr/src/render/morph.rs +++ b/crates/bevy_pbr/src/render/morph.rs @@ -1,4 +1,4 @@ -use std::{iter, mem, mem::size_of}; +use std::{iter, mem}; use bevy_ecs::entity::EntityHashMap; use bevy_ecs::prelude::*; diff --git a/crates/bevy_ptr/src/lib.rs b/crates/bevy_ptr/src/lib.rs index 1d997b9da8..c9511bae16 100644 --- a/crates/bevy_ptr/src/lib.rs +++ b/crates/bevy_ptr/src/lib.rs @@ -603,7 +603,6 @@ trait DebugEnsureAligned { impl DebugEnsureAligned for *mut T { #[track_caller] fn debug_ensure_aligned(self) -> Self { - use core::mem::align_of; let align = align_of::(); // Implementation shamelessly borrowed from the currently unstable // ptr.is_aligned_to. diff --git a/crates/bevy_render/src/mesh/morph.rs b/crates/bevy_render/src/mesh/morph.rs index 8055d2975f..e44dd65b44 100644 --- a/crates/bevy_render/src/mesh/morph.rs +++ b/crates/bevy_render/src/mesh/morph.rs @@ -11,7 +11,7 @@ use bevy_hierarchy::Children; use bevy_math::Vec3; use bevy_reflect::prelude::*; use bytemuck::{Pod, Zeroable}; -use std::{iter, mem::size_of}; +use std::iter; use thiserror::Error; const MAX_TEXTURE_WIDTH: u32 = 2048; diff --git a/crates/bevy_render/src/render_resource/buffer_vec.rs b/crates/bevy_render/src/render_resource/buffer_vec.rs index c50cf0583c..c720605d92 100644 --- a/crates/bevy_render/src/render_resource/buffer_vec.rs +++ b/crates/bevy_render/src/render_resource/buffer_vec.rs @@ -1,4 +1,4 @@ -use std::{iter, marker::PhantomData, mem::size_of}; +use std::{iter, marker::PhantomData}; use crate::{ render_resource::Buffer, @@ -123,7 +123,7 @@ impl RawBufferVec { } /// Creates a [`Buffer`] on the [`RenderDevice`] with size - /// at least `std::mem::size_of::() * capacity`, unless a such a buffer already exists. + /// at least `size_of::() * capacity`, unless a such a buffer already exists. /// /// If a [`Buffer`] exists, but is too small, references to it will be discarded, /// and a new [`Buffer`] will be created. Any previously created [`Buffer`]s @@ -302,7 +302,7 @@ where } /// Creates a [`Buffer`] on the [`RenderDevice`] with size - /// at least `std::mem::size_of::() * capacity`, unless such a buffer already exists. + /// at least `size_of::() * capacity`, unless such a buffer already exists. /// /// If a [`Buffer`] exists, but is too small, references to it will be discarded, /// and a new [`Buffer`] will be created. Any previously created [`Buffer`]s diff --git a/crates/bevy_render/src/view/visibility/mod.rs b/crates/bevy_render/src/view/visibility/mod.rs index 2af0936607..b219b89f12 100644 --- a/crates/bevy_render/src/view/visibility/mod.rs +++ b/crates/bevy_render/src/view/visibility/mod.rs @@ -537,7 +537,6 @@ mod test { use super::*; use bevy_app::prelude::*; use bevy_hierarchy::BuildChildren; - use std::mem::size_of; fn visibility_bundle(visibility: Visibility) -> VisibilityBundle { VisibilityBundle { diff --git a/examples/ecs/dynamic.rs b/examples/ecs/dynamic.rs index 7bcd4e01d3..855ed02c12 100644 --- a/examples/ecs/dynamic.rs +++ b/examples/ecs/dynamic.rs @@ -3,7 +3,7 @@ //! This example show how you can create components dynamically, spawn entities with those components //! as well as query for entities with those components. -use std::{alloc::Layout, io::Write, mem::size_of, ptr::NonNull}; +use std::{alloc::Layout, io::Write, ptr::NonNull}; use bevy::prelude::*; use bevy::{ @@ -41,7 +41,7 @@ query, q Query for entities Accesses: 'A' with, '&A' read, '&mut A' write Operators: '||' or, ',' and, '?' optional - + e.g. &A || &B, &mut C, D, ?E"; fn main() { diff --git a/examples/shader/custom_phase_item.rs b/examples/shader/custom_phase_item.rs index 88f1b34cea..7a601b4989 100644 --- a/examples/shader/custom_phase_item.rs +++ b/examples/shader/custom_phase_item.rs @@ -36,7 +36,6 @@ use bevy::{ }, }; use bytemuck::{Pod, Zeroable}; -use std::mem::size_of; /// A marker component that represents an entity that is to be rendered using /// our custom phase item. diff --git a/examples/shader/gpu_readback.rs b/examples/shader/gpu_readback.rs index 93d0810fbe..ce11f6471f 100644 --- a/examples/shader/gpu_readback.rs +++ b/examples/shader/gpu_readback.rs @@ -17,7 +17,6 @@ use bevy::{ }, }; use crossbeam_channel::{Receiver, Sender}; -use std::mem::size_of; /// This example uses a shader source file from the assets subdirectory const SHADER_ASSET_PATH: &str = "shaders/gpu_readback.wgsl"; diff --git a/examples/shader/shader_instancing.rs b/examples/shader/shader_instancing.rs index 0e17e8f8db..0fe1c2713a 100644 --- a/examples/shader/shader_instancing.rs +++ b/examples/shader/shader_instancing.rs @@ -27,7 +27,6 @@ use bevy::{ }, }; use bytemuck::{Pod, Zeroable}; -use std::mem::size_of; /// This example uses a shader source file from the assets subdirectory const SHADER_ASSET_PATH: &str = "shaders/instancing.wgsl";