Remove remaining use crate as.

raldone01 · raldone01 · commit bf4581c8c520 · 2025-01-12T21:23:08.000+01:00
diff --git a/crates/bevy_ecs/src/event/collections.rs b/crates/bevy_ecs/src/event/collections.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 use alloc::vec::Vec;
 use bevy_ecs::{
     event::{Event, EventCursor, EventId, EventInstance},
diff --git a/crates/bevy_ecs/src/event/event_cursor.rs b/crates/bevy_ecs/src/event/event_cursor.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 use bevy_ecs::event::{
     Event, EventIterator, EventIteratorWithId, EventMutIterator, EventMutIteratorWithId, Events,
 };
diff --git a/crates/bevy_ecs/src/event/iterators.rs b/crates/bevy_ecs/src/event/iterators.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 #[cfg(feature = "multi_threaded")]
 use bevy_ecs::batching::BatchingStrategy;
 use bevy_ecs::event::{Event, EventCursor, EventId, EventInstance, Events};
diff --git a/crates/bevy_ecs/src/event/mod.rs b/crates/bevy_ecs/src/event/mod.rs
@@ -31,7 +31,6 @@ pub use writer::EventWriter;
 
 #[cfg(test)]
 mod tests {
-    use crate as bevy_ecs;
     use alloc::{vec, vec::Vec};
     use bevy_ecs::{event::*, system::assert_is_read_only_system};
     use bevy_ecs_macros::Event;
diff --git a/crates/bevy_ecs/src/event/mut_iterators.rs b/crates/bevy_ecs/src/event/mut_iterators.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 #[cfg(feature = "multi_threaded")]
 use bevy_ecs::batching::BatchingStrategy;
 use bevy_ecs::event::{Event, EventCursor, EventId, EventInstance, Events};
diff --git a/crates/bevy_ecs/src/event/mutator.rs b/crates/bevy_ecs/src/event/mutator.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 #[cfg(feature = "multi_threaded")]
 use bevy_ecs::event::EventMutParIter;
 use bevy_ecs::{
diff --git a/crates/bevy_ecs/src/event/reader.rs b/crates/bevy_ecs/src/event/reader.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 #[cfg(feature = "multi_threaded")]
 use bevy_ecs::event::EventParIter;
 use bevy_ecs::{
diff --git a/crates/bevy_ecs/src/event/registry.rs b/crates/bevy_ecs/src/event/registry.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 use alloc::vec::Vec;
 use bevy_ecs::{
     change_detection::{DetectChangesMut, MutUntyped},
diff --git a/crates/bevy_ecs/src/event/update.rs b/crates/bevy_ecs/src/event/update.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 use bevy_ecs::{
     change_detection::Mut,
     component::Tick,
diff --git a/crates/bevy_ecs/src/event/writer.rs b/crates/bevy_ecs/src/event/writer.rs
@@ -1,4 +1,3 @@
-use crate as bevy_ecs;
 use bevy_ecs::{
     event::{Event, EventId, Events, SendBatchIds},
     system::{ResMut, SystemParam},
diff --git a/crates/bevy_ecs/src/schedule/stepping.rs b/crates/bevy_ecs/src/schedule/stepping.rs
@@ -824,8 +824,6 @@ mod tests {
     use alloc::{format, vec};
     use std::println;
 
-    pub use crate as bevy_ecs;
-
     #[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
     struct TestSchedule;
 
diff --git a/crates/bevy_ecs/src/storage/blob_array.rs b/crates/bevy_ecs/src/storage/blob_array.rs
@@ -479,7 +479,6 @@ impl BlobArray {
 
 #[cfg(test)]
 mod tests {
-    use crate as bevy_ecs;
     use bevy_ecs::prelude::*;
 
     #[derive(Component)]
diff --git a/crates/bevy_macro_utils/src/bevy_manifest.rs b/crates/bevy_macro_utils/src/bevy_manifest.rs
@@ -1,12 +1,13 @@
 extern crate proc_macro;
 
-use std::sync::LazyLock;
+use std::sync::MutexGuard;
 
 use cargo_manifest_proc_macros::{
     CargoManifest, CrateReExportingPolicy, KnownReExportingCrate, PathPiece,
     TryResolveCratePathError,
 };
 use proc_macro::TokenStream;
+
 struct BevyReExportingPolicy;
 
 impl CrateReExportingPolicy for BevyReExportingPolicy {
@@ -19,29 +20,29 @@ impl CrateReExportingPolicy for BevyReExportingPolicy {
     }
 }
 
+const BEVY: &str = "bevy";
+
 const KNOWN_RE_EXPORTING_CRATE_BEVY: KnownReExportingCrate = KnownReExportingCrate {
-    re_exporting_crate_package_name: "bevy",
+    re_exporting_crate_package_name: BEVY,
     crate_re_exporting_policy: &BevyReExportingPolicy {},
 };
 
 const ALL_KNOWN_RE_EXPORTING_CRATES: &[&KnownReExportingCrate] = &[&KNOWN_RE_EXPORTING_CRATE_BEVY];
 
 /// The path to the `Cargo.toml` file for the Bevy project.
-pub struct BevyManifest {}
-
-const BEVY: &str = "bevy";
+pub struct BevyManifest(MutexGuard<'static, CargoManifest>);
 
 impl BevyManifest {
     /// Returns a global shared instance of the [`BevyManifest`] struct.
-    pub fn shared() -> &'static LazyLock<Self> {
-        static LAZY_SELF: LazyLock<BevyManifest> = LazyLock::new(|| BevyManifest {});
-        &LAZY_SELF
+    pub fn shared() -> Self {
+        Self(CargoManifest::shared())
     }
 
     /// Attempt to retrieve the [path](syn::Path) of a particular package in
     /// the [manifest](BevyManifest) by [name](str).
     pub fn maybe_get_path(&self, name: &str) -> Result<syn::Path, TryResolveCratePathError> {
-        CargoManifest::shared().try_resolve_crate_path(name, ALL_KNOWN_RE_EXPORTING_CRATES)
+        self.0
+            .try_resolve_crate_path(name, ALL_KNOWN_RE_EXPORTING_CRATES)
     }
 
     /// Returns the path for the crate with the given name.
diff --git a/crates/bevy_reflect/src/attributes.rs b/crates/bevy_reflect/src/attributes.rs
@@ -178,7 +178,6 @@ pub(crate) use impl_custom_attribute_methods;
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate as bevy_reflect;
     use crate::{type_info::Typed, TypeInfo, VariantInfo};
     use alloc::{format, string::String};
     use core::ops::RangeInclusive;
diff --git a/crates/bevy_reflect/src/enums/enum_trait.rs b/crates/bevy_reflect/src/enums/enum_trait.rs
@@ -316,7 +316,6 @@ impl<'a> VariantField<'a> {
 // Tests that need access to internal fields have to go here rather than in mod.rs
 #[cfg(test)]
 mod tests {
-    use crate as bevy_reflect;
     use crate::*;
 
     #[derive(Reflect, Debug, PartialEq)]
diff --git a/crates/bevy_reflect/src/enums/mod.rs b/crates/bevy_reflect/src/enums/mod.rs
@@ -10,7 +10,6 @@ pub use variants::*;
 
 #[cfg(test)]
 mod tests {
-    use crate as bevy_reflect;
     use crate::*;
     use alloc::boxed::Box;
 
diff --git a/crates/bevy_reflect/src/enums/variants.rs b/crates/bevy_reflect/src/enums/variants.rs
@@ -359,7 +359,6 @@ impl UnitVariantInfo {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate as bevy_reflect;
     use crate::{Reflect, Typed};
 
     #[test]
diff --git a/crates/bevy_reflect/src/generics.rs b/crates/bevy_reflect/src/generics.rs
@@ -239,7 +239,6 @@ pub(crate) use impl_generic_info_methods;
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate as bevy_reflect;
     use crate::{Reflect, Typed};
     use alloc::string::String;
     use core::fmt::Debug;
diff --git a/crates/bevy_reflect/src/impls/glam.rs b/crates/bevy_reflect/src/impls/glam.rs
@@ -1,4 +1,3 @@
-use crate as bevy_reflect;
 use crate::{std_traits::ReflectDefault, ReflectDeserialize, ReflectSerialize};
 use assert_type_match::assert_type_match;
 use bevy_reflect_derive::{impl_reflect, impl_reflect_opaque};
diff --git a/crates/bevy_reflect/src/impls/uuid.rs b/crates/bevy_reflect/src/impls/uuid.rs
@@ -1,5 +1,3 @@
-use crate as bevy_reflect;
-
 use crate::{std_traits::ReflectDefault, ReflectDeserialize, ReflectSerialize};
 use bevy_reflect_derive::impl_reflect_opaque;
 
diff --git a/crates/bevy_reflect/src/lib.rs b/crates/bevy_reflect/src/lib.rs
@@ -752,7 +752,6 @@ mod tests {
     use static_assertions::{assert_impl_all, assert_not_impl_all};
 
     use super::{prelude::*, *};
-    use crate as bevy_reflect;
     use crate::{
         serde::{ReflectDeserializer, ReflectSerializer},
         utility::GenericTypePathCell,
diff --git a/crates/bevy_reflect/src/path/mod.rs b/crates/bevy_reflect/src/path/mod.rs
@@ -512,7 +512,6 @@ impl core::ops::IndexMut<usize> for ParsedPath {
 )]
 mod tests {
     use super::*;
-    use crate as bevy_reflect;
     use crate::*;
     use alloc::vec;
 
diff --git a/crates/bevy_reflect/src/struct_trait.rs b/crates/bevy_reflect/src/struct_trait.rs
@@ -584,7 +584,6 @@ pub fn struct_debug(dyn_struct: &dyn Struct, f: &mut Formatter<'_>) -> core::fmt
 
 #[cfg(test)]
 mod tests {
-    use crate as bevy_reflect;
     use crate::*;
     #[derive(Reflect, Default)]
     struct MyStruct {
diff --git a/crates/bevy_reflect/src/tuple_struct.rs b/crates/bevy_reflect/src/tuple_struct.rs
@@ -494,7 +494,6 @@ pub fn tuple_struct_debug(
 
 #[cfg(test)]
 mod tests {
-    use crate as bevy_reflect;
     use crate::*;
     #[derive(Reflect)]
     struct Ts(u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8);
diff --git a/crates/bevy_reflect/src/type_registry.rs b/crates/bevy_reflect/src/type_registry.rs
@@ -868,7 +868,6 @@ impl<T: Reflect> FromType<T> for ReflectFromPtr {
 )]
 mod test {
     use super::*;
-    use crate as bevy_reflect;
 
     #[test]
     fn test_reflect_from_ptr() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use crate as bevy_ecs;`
`2`	`1`	`use alloc::vec::Vec;`
`3`	`2`	`use bevy_ecs::{`
`4`	`3`	`event::{Event, EventCursor, EventId, EventInstance},`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use crate as bevy_ecs;`
`2`	`1`	`use bevy_ecs::event::{`
`3`	`2`	`Event, EventIterator, EventIteratorWithId, EventMutIterator, EventMutIteratorWithId, Events,`
`4`	`3`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use crate as bevy_ecs;`
`2`	`1`	`#[cfg(feature = "multi_threaded")]`
`3`	`2`	`use bevy_ecs::batching::BatchingStrategy;`
`4`	`3`	`use bevy_ecs::event::{Event, EventCursor, EventId, EventInstance, Events};`