chore!: reduce root exports

ten3roberts · Oct 15, 2023 · 1485751 · 1485751
1 parent f2267c9
commit 1485751
Show file tree

Hide file tree

Showing 67 changed files with 228 additions and 120 deletions.
diff --git a/examples/guide/builder.rs b/examples/guide/builder.rs
@@ -1,4 +1,8 @@
-use flax::{filter::All, *};
+use flax::{
+    components::{child_of, name},
+    filter::All,
+    *,
+};
 use itertools::Itertools;
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use tracing::info_span;

diff --git a/examples/guide/change_detection.rs b/examples/guide/change_detection.rs
@@ -1,8 +1,8 @@
 use std::{thread::sleep, time::Duration};
 
 use flax::{
-    component, entity_ids, name, CommandBuffer, Entity, FetchExt, Query, QueryBorrow, Schedule,
-    System, World,
+    component, components::name, entity_ids, CommandBuffer, Entity, FetchExt, Query, QueryBorrow,
+    Schedule, System, World,
 };
 use itertools::Itertools;
 use rand::{rngs::StdRng, seq::SliceRandom, Rng, SeedableRng};

diff --git a/examples/guide/commandbuffer.rs b/examples/guide/commandbuffer.rs
@@ -1,5 +1,8 @@
 use anyhow::Context;
-use flax::*;
+use flax::{
+    components::{child_of, name},
+    *,
+};
 use glam::{vec2, Mat4, Vec2};
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use tracing_subscriber::{prelude::*, registry};

diff --git a/examples/guide/relations.rs b/examples/guide/relations.rs
@@ -1,4 +1,7 @@
-use flax::*;
+use flax::{
+    components::{child_of, name},
+    *,
+};
 use itertools::Itertools;
 use tracing_subscriber::{prelude::*, registry};
 use tracing_tree::HierarchicalLayer;

diff --git a/examples/guide/serialize.rs b/examples/guide/serialize.rs
@@ -3,7 +3,7 @@ fn main() {}
 
 #[cfg(feature = "serde")]
 fn main() -> anyhow::Result<()> {
-    use flax::*;
+    use flax::{components::name, *};
     use glam::*;
     use rand::{distributions::Standard, rngs::StdRng, Rng, SeedableRng};
 

diff --git a/examples/query/basic.rs b/examples/query/basic.rs
@@ -1,6 +1,6 @@
 use std::f32::consts::TAU;
 
-use flax::*;
+use flax::{components::name, *};
 use glam::{vec3, Vec3};
 use itertools::Itertools;
 use rand::{rngs::StdRng, Rng, SeedableRng};

diff --git a/examples/query/graphs.rs b/examples/query/graphs.rs
@@ -1,4 +1,4 @@
-use flax::{child_of, entity_ids, name, Dfs, Entity, Query, Topo, World};
+use flax::{components::{name, child_of}, entity_ids, Dfs, Entity, Query, Topo, World};
 use tracing_subscriber::{prelude::*, EnvFilter};
 use tracing_tree::HierarchicalLayer;
 

diff --git a/examples/query/transform.rs b/examples/query/transform.rs
@@ -1,4 +1,8 @@
-use flax::{filter::All, *};
+use flax::{
+    components::{child_of, name},
+    filter::All,
+    *,
+};
 use glam::{vec3, Vec3};
 use std::fmt::Write;
 use tracing_subscriber::{prelude::*, EnvFilter};

diff --git a/src/archetype/batch.rs b/src/archetype/batch.rs
@@ -2,7 +2,11 @@ use core::mem;
 
 use alloc::{collections::BTreeMap, vec::Vec};
 
-use crate::{error::Result, Component, ComponentDesc, ComponentKey, ComponentValue, Entity, Error};
+use crate::{
+    component::{ComponentDesc, ComponentKey, ComponentValue},
+    error::Result,
+    Component, Entity, Error,
+};
 
 use super::Storage;
 

diff --git a/src/archetype/guard.rs b/src/archetype/guard.rs
@@ -6,7 +6,7 @@ use core::{
 
 use atomic_refcell::{AtomicRef, AtomicRefMut};
 
-use crate::{ComponentValue, Entity};
+use crate::{component::ComponentValue, Entity};
 
 use super::{CellData, Changes, Slice, Slot};
 

diff --git a/src/archetype/mod.rs b/src/archetype/mod.rs
@@ -9,9 +9,10 @@ use atomic_refcell::{AtomicRef, AtomicRefCell, BorrowError, BorrowMutError};
 use itertools::Itertools;
 
 use crate::{
+    component::{ComponentDesc, ComponentKey, ComponentValue},
     events::{EventData, EventKind, EventSubscriber},
     writer::ComponentUpdater,
-    Component, ComponentDesc, ComponentKey, ComponentValue, Entity,
+    Component, Entity,
 };
 
 /// Unique archetype id

diff --git a/src/archetype/storage.rs b/src/archetype/storage.rs
@@ -4,7 +4,7 @@ use alloc::{
     alloc::alloc, alloc::dealloc, alloc::handle_alloc_error, alloc::realloc, alloc::Layout,
 };
 
-use crate::{ComponentDesc, ComponentKey, ComponentValue};
+use crate::component::{ComponentDesc, ComponentKey, ComponentValue};
 
 use super::Slot;
 

diff --git a/src/archetypes.rs b/src/archetypes.rs
@@ -1,11 +1,12 @@
 use alloc::{sync::Arc, vec::Vec};
 
 use crate::{
-    archetype::Archetype,
+    archetype::{Archetype, ArchetypeId},
+    component::ComponentDesc,
     entity::{EntityKind, EntityStore, EntityStoreIter, EntityStoreIterMut},
     events::EventSubscriber,
     metadata::exclusive,
-    ArchetypeId, ComponentDesc, Entity,
+    Entity,
 };
 
 pub(crate) struct Archetypes {

diff --git a/src/buffer.rs b/src/buffer.rs
@@ -5,9 +5,10 @@ use core::ptr::{self, NonNull};
 use alloc::alloc::{dealloc, handle_alloc_error, realloc};
 use alloc::collections::BTreeMap;
 
+use crate::component::{ComponentDesc, ComponentKey, ComponentValue};
 use crate::format::MissingDebug;
 use crate::metadata::debuggable;
-use crate::{metadata, Component, ComponentDesc, ComponentKey, ComponentValue, Entity};
+use crate::{metadata, Component, Entity};
 
 type Offset = usize;
 

diff --git a/src/commands.rs b/src/commands.rs
@@ -5,8 +5,9 @@ use anyhow::Context;
 
 use crate::{
     buffer::MultiComponentBuffer,
+    component::{ComponentDesc, ComponentValue},
     writer::{MissingDyn, SingleComponentWriter, WriteDedupDyn},
-    BatchSpawn, Component, ComponentDesc, ComponentValue, Entity, EntityBuilder, World,
+    BatchSpawn, Component, Entity, EntityBuilder, World,
 };
 
 type DeferFn = Box<dyn Fn(&mut World) -> anyhow::Result<()> + Send + Sync>;

diff --git a/src/components.rs b/src/components.rs
@@ -6,7 +6,7 @@ use alloc::string::String;
 use crate::component;
 use crate::Exclusive;
 
-use crate::ComponentDesc;
+use crate::component::ComponentDesc;
 use crate::Debuggable;
 
 component! {

diff --git a/src/entity/builder.rs b/src/entity/builder.rs
@@ -1,6 +1,8 @@
 use crate::{
-    buffer::ComponentBuffer, error::Result, CommandBuffer, Component, ComponentDesc,
-    ComponentValue, Entity, RelationExt, World,
+    buffer::ComponentBuffer,
+    component::{ComponentDesc, ComponentValue},
+    error::Result,
+    CommandBuffer, Component, Entity, RelationExt, World,
 };
 use alloc::{boxed::Box, vec::Vec};
 
@@ -207,7 +209,7 @@ impl From<&mut EntityBuilder> for EntityBuilder {
 
 #[cfg(test)]
 mod test {
-    use crate::{error::MissingComponent, *};
+    use crate::{component, components::name, error::MissingComponent, Entity, Error, World};
 
     #[test]
     fn builder() {

diff --git a/src/entity_ref.rs b/src/entity_ref.rs
@@ -8,14 +8,15 @@ use once_cell::unsync::OnceCell;
 
 use crate::{
     archetype::{Archetype, RefMut},
+    component::{ComponentKey, ComponentValue},
+    components::name,
     entity::EntityLocation,
     entry::{Entry, OccupiedEntry, VacantEntry},
     error::MissingComponent,
     format::EntityFormatter,
-    name,
     query::QueryOne,
     writer::{EntityWriter, FnWriter, Missing, Replace, SingleComponentWriter, WriteDedup},
-    Component, ComponentKey, ComponentValue, Entity, Fetch, RelationExt, World,
+    Component, Entity, Fetch, RelationExt, World,
 };
 use crate::{RelationIter, RelationIterMut};
 
@@ -479,7 +480,11 @@ impl Display for EntityRefMut<'_> {
 #[cfg(test)]
 mod test {
 
-    use crate::{component, components::name, is_static, EntityBuilder, FetchExt, Query};
+    use crate::{
+        component,
+        components::{is_static, name},
+        EntityBuilder, FetchExt, Query,
+    };
 
     use super::*;
 

diff --git a/src/entry.rs b/src/entry.rs
@@ -2,8 +2,9 @@ use core::mem;
 
 use crate::{
     archetype::RefMut,
+    component::ComponentValue,
     writer::{Replace, SingleComponentWriter},
-    Component, ComponentValue, Entity, World,
+    Component, Entity, World,
 };
 
 /// Entry like api for an entity's component

diff --git a/src/error.rs b/src/error.rs
@@ -1,6 +1,6 @@
 use core::fmt::Display;
 
-use crate::{ComponentDesc, Entity};
+use crate::{component::ComponentDesc, Entity};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[non_exhaustive]

diff --git a/src/events.rs b/src/events.rs
@@ -1,7 +1,10 @@
 use alloc::vec::Vec;
 
 use crate::{
-    archetype::Archetype, filter::StaticFilter, ComponentDesc, ComponentKey, ComponentValue, Entity,
+    archetype::Archetype,
+    component::{ComponentDesc, ComponentKey, ComponentValue},
+    filter::StaticFilter,
+    Entity,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq)]

diff --git a/src/fetch/component.rs b/src/fetch/component.rs
@@ -1,6 +1,6 @@
 use atomic_refcell::AtomicRef;
 
-use crate::{archetype::Slot, system::AccessKind, util::Ptr, Component, ComponentValue};
+use crate::{archetype::Slot, component::ComponentValue, system::AccessKind, util::Ptr, Component};
 
 use super::{read_only::RandomFetch, *};
 

diff --git a/src/fetch/component_mut.rs b/src/fetch/component_mut.rs
@@ -4,9 +4,10 @@ use core::fmt::{self, Formatter};
 
 use crate::{
     archetype::{Archetype, CellMutGuard, Slice},
+    component::ComponentValue,
     system::{Access, AccessKind},
     util::PtrMut,
-    Component, ComponentValue, Fetch, FetchItem,
+    Component, Fetch, FetchItem,
 };
 
 use super::{FetchAccessData, FetchPrepareData, PreparedFetch};

diff --git a/src/fetch/entity_ref.rs b/src/fetch/entity_ref.rs
@@ -1,10 +1,11 @@
 use alloc::vec::Vec;
 
 use crate::{
+    archetype::ArchetypeId,
     archetype::{Archetype, Slot},
     entity::EntityLocation,
     system::{Access, AccessKind},
-    ArchetypeId, EntityRef, Fetch, FetchItem, World,
+    EntityRef, Fetch, FetchItem, World,
 };
 
 use super::{FetchAccessData, PreparedFetch};
@@ -104,7 +105,9 @@ impl<'w, 'q> PreparedFetch<'q> for PreparedEntityRef<'w> {
 mod test {
     use itertools::Itertools;
 
-    use crate::{component, name, BatchSpawn, Entity, EntityIds, FetchExt, Query, World};
+    use crate::{
+        component, components::name, BatchSpawn, Entity, EntityIds, FetchExt, Query, World,
+    };
 
     #[test]
     fn entity_refs_chunks() {

diff --git a/src/fetch/ext.rs b/src/fetch/ext.rs
@@ -1,6 +1,7 @@
 use crate::{
+    component::ComponentValue,
     filter::{Cmp, Equal, Greater, GreaterEq, Less, LessEq},
-    ComponentValue, Fetch, FetchItem, RelationExt,
+    Fetch, FetchItem, RelationExt,
 };
 
 use super::{

diff --git a/src/fetch/maybe_mut.rs b/src/fetch/maybe_mut.rs
@@ -4,8 +4,9 @@ use core::marker::PhantomData;
 
 use crate::{
     archetype::{Cell, RefMut, Slot},
+    component::ComponentValue,
     system::{Access, AccessKind},
-    Component, ComponentValue, Entity, Fetch, FetchItem,
+    Component, Entity, Fetch, FetchItem,
 };
 
 use super::{FetchAccessData, PreparedFetch, RandomFetch};

diff --git a/src/fetch/mod.rs b/src/fetch/mod.rs
@@ -15,11 +15,11 @@ mod source;
 mod transform;
 
 use crate::{
-    archetype::{Archetype, Slice, Slot},
+    archetype::{Archetype, ArchetypeId, Slice, Slot},
     filter::{RefFetch, StaticFilter},
     system::Access,
     util::Ptr,
-    ArchetypeId, ArchetypeSearcher, Entity, EntityRef, World,
+    ArchetypeSearcher, Entity, World,
 };
 use alloc::vec::Vec;
 use core::fmt::Debug;

diff --git a/src/fetch/relations.rs b/src/fetch/relations.rs
@@ -8,9 +8,9 @@ use smallvec::SmallVec;
 
 use crate::{
     archetype::{CellGuard, Slot},
-    component::dummy,
+    component::{dummy, ComponentValue},
     system::{Access, AccessKind},
-    Component, ComponentValue, Entity, Fetch, FetchItem, RelationExt,
+    Component, Entity, Fetch, FetchItem, RelationExt,
 };
 
 use super::{FetchAccessData, FetchPrepareData, PreparedFetch};

diff --git a/src/fetch/satisfied.rs b/src/fetch/satisfied.rs
@@ -79,7 +79,7 @@ mod test {
     use itertools::Itertools;
     use pretty_assertions::assert_eq;
 
-    use crate::{component, name, Entity, FetchExt, Query, World};
+    use crate::{component, components::name, Entity, FetchExt, Query, World};
 
     component! {
         a: i32,

diff --git a/src/fetch/source.rs b/src/fetch/source.rs
@@ -3,9 +3,9 @@ use core::{fmt::Debug, marker::PhantomData};
 use alloc::vec::Vec;
 
 use crate::{
-    archetype::{Archetype, Slice, Slot},
+    archetype::{Archetype, ArchetypeId, Slice, Slot},
     system::Access,
-    ArchetypeId, Entity, Fetch, FetchItem,
+    Entity, Fetch, FetchItem,
 };
 
 use super::{FetchAccessData, FetchPrepareData, PreparedFetch, RandomFetch};
@@ -268,7 +268,11 @@ pub struct PreparedSource<'w, Q> {
 mod test {
     use itertools::Itertools;
 
-    use crate::{child_of, component, entity_ids, name, FetchExt, Query, Topo, World};
+    use crate::{
+        component,
+        components::{child_of, name},
+        entity_ids, FetchExt, Query, Topo, World,
+    };
 
     use super::*;
 

diff --git a/src/fetch/transform.rs b/src/fetch/transform.rs
@@ -1,5 +1,6 @@
 use crate::{
-    archetype::ChangeKind, filter::ChangeFilter, filter::Union, Component, ComponentValue,
+    archetype::ChangeKind, component::ComponentValue, filter::ChangeFilter, filter::Union,
+    Component,
 };
 
 /// Allows transforming a fetch into another.

diff --git a/src/filter/change.rs b/src/filter/change.rs
@@ -3,12 +3,13 @@ use core::fmt::Formatter;
 use itertools::Itertools;
 
 use crate::archetype::{CellGuard, Change, Slot};
+use crate::component::ComponentValue;
 use crate::fetch::{FetchAccessData, FetchPrepareData, PreparedFetch, RandomFetch};
 use crate::system::Access;
 use crate::util::Ptr;
 use crate::{
     archetype::{ChangeKind, ChangeList, Slice},
-    Component, ComponentValue, Fetch, FetchItem,
+    Component, Fetch, FetchItem,
 };
 
 static EMPTY_CHANGELIST: ChangeList = ChangeList::new();