From efe97b82293393e07b63dad3d920261c531c9b6b Mon Sep 17 00:00:00 2001 From: Dmitry Stepanov Date: Tue, 11 Aug 2026 11:48:55 +0300 Subject: [PATCH] handle non-exhaustive enums in `Visit` proc-macro correctly --- editor/src/configurator.rs | 6 +----- fyrox-animation/src/lib.rs | 2 +- fyrox-animation/src/machine/mod.rs | 5 +---- fyrox-animation/src/machine/node/blend.rs | 2 +- fyrox-core-derive/src/lib.rs | 12 ++++++------ fyrox-core-derive/src/visit.rs | 1 + fyrox-core/src/color.rs | 2 +- fyrox-core/src/color_gradient.rs | 6 +----- fyrox-core/src/lib.rs | 2 +- fyrox-core/src/sstorage.rs | 6 +----- fyrox-core/src/visitor/error.rs | 6 ++++++ fyrox-core/src/visitor/mod.rs | 2 +- fyrox-impl/src/resource/model/mod.rs | 2 +- fyrox-impl/src/scene/base.rs | 2 +- fyrox-impl/src/scene/camera.rs | 2 +- fyrox-impl/src/scene/graph/mod.rs | 2 +- fyrox-impl/src/scene/light/directional.rs | 2 +- fyrox-impl/src/scene/light/mod.rs | 7 ++----- fyrox-impl/src/scene/light/point.rs | 2 +- fyrox-impl/src/scene/light/spot.rs | 2 +- fyrox-impl/src/scene/mesh/surface.rs | 2 +- fyrox-impl/src/scene/node/container.rs | 7 +------ fyrox-impl/src/scene/node/mod.rs | 2 +- fyrox-impl/src/scene/sprite.rs | 2 +- fyrox-impl/src/scene/transform.rs | 2 +- fyrox-impl/src/script/mod.rs | 2 +- fyrox-impl/src/utils/navmesh.rs | 2 +- fyrox-resource/src/constructor.rs | 2 +- fyrox-resource/src/manager.rs | 2 +- fyrox-sound/src/dsp/filters.rs | 5 +---- fyrox-sound/src/dsp/mod.rs | 2 +- fyrox-sound/src/engine.rs | 2 +- fyrox-sound/src/renderer/hrtf.rs | 2 +- fyrox-sound/src/renderer/mod.rs | 5 +---- fyrox-sound/src/source.rs | 7 +------ fyrox-texture/src/lib.rs | 2 +- fyrox-ui/src/node/container.rs | 7 +------ 37 files changed, 48 insertions(+), 80 deletions(-) diff --git a/editor/src/configurator.rs b/editor/src/configurator.rs index c3e44fcb3..124db388f 100644 --- a/editor/src/configurator.rs +++ b/editor/src/configurator.rs @@ -20,11 +20,7 @@ use crate::{ fyrox::{ - core::{ - algebra::Vector2, - pool::Handle, - visitor::{Visit, VisitResult, Visitor}, - }, + core::{algebra::Vector2, pool::Handle, visitor::prelude::*}, gui::{ border::BorderBuilder, button::{ButtonBuilder, ButtonMessage}, diff --git a/fyrox-animation/src/lib.rs b/fyrox-animation/src/lib.rs index 872e932c0..407188538 100644 --- a/fyrox-animation/src/lib.rs +++ b/fyrox-animation/src/lib.rs @@ -33,7 +33,7 @@ use crate::{ pool::{ErasedHandle, Handle, Pool, Ticket}, reflect::prelude::*, uuid::{uuid, Uuid}, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, ImmutableString, NameProvider, }, track::Track, diff --git a/fyrox-animation/src/machine/mod.rs b/fyrox-animation/src/machine/mod.rs index 797fb1ae2..9da324264 100644 --- a/fyrox-animation/src/machine/mod.rs +++ b/fyrox-animation/src/machine/mod.rs @@ -26,10 +26,7 @@ #![warn(missing_docs)] use crate::{ - core::{ - reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, - }, + core::{reflect::prelude::*, visitor::prelude::*}, Animation, AnimationContainer, AnimationPose, EntityId, }; use fxhash::FxHashSet; diff --git a/fyrox-animation/src/machine/node/blend.rs b/fyrox-animation/src/machine/node/blend.rs index 6f9d668fd..0b9e2da46 100644 --- a/fyrox-animation/src/machine/node/blend.rs +++ b/fyrox-animation/src/machine/node/blend.rs @@ -24,7 +24,7 @@ use crate::{ core::{ pool::{Handle, Pool}, reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, machine::{ node::AnimationEventCollectionStrategy, node::BasePoseNode, AnimationPoseSource, Parameter, diff --git a/fyrox-core-derive/src/lib.rs b/fyrox-core-derive/src/lib.rs index 32dec1c37..647567881 100644 --- a/fyrox-core-derive/src/lib.rs +++ b/fyrox-core-derive/src/lib.rs @@ -37,7 +37,7 @@ use syn::{parse_macro_input, DeriveInput}; /// For example, /// /// ``` -/// use fyrox_core::visitor::{Visit, VisitResult, Visitor}; +/// use fyrox_core::visitor::prelude::*; /// #[derive(Visit)] /// struct Foo { /// example_one: String, @@ -49,7 +49,7 @@ use syn::{parse_macro_input, DeriveInput}; /// would expand to something like: /// /// ``` -/// # use fyrox_core::visitor::{Visit, VisitResult, Visitor}; +/// # use fyrox_core::visitor::prelude::*; /// # struct Foo { example_one: String, example_two: T,} /// impl Visit for Foo where T: Visit { /// fn visit(&mut self, name: &str, visitor: &mut Visitor) -> VisitResult { @@ -66,7 +66,7 @@ use syn::{parse_macro_input, DeriveInput}; /// [to_case(Case::UpperCamel)](https://docs.rs/convert_case/0.6.0/convert_case/enum.Case.html#variant.Pascal). /// /// ``` -/// # use fyrox_core::visitor::{Visit, VisitResult, Visitor}; +/// # use fyrox_core::visitor::prelude::*; /// #[derive(Visit)] /// struct Pair (usize, usize); /// # fn main() {} @@ -75,7 +75,7 @@ use syn::{parse_macro_input, DeriveInput}; /// would expand to something like: /// /// ``` -/// # use fyrox_core::visitor::{Visit, VisitResult, Visitor}; +/// # use fyrox_core::visitor::prelude::*; /// # struct Pair (usize, usize); /// impl Visit for Pair { /// fn visit(&mut self, name: &str, visitor: &mut Visitor) -> VisitResult { @@ -89,7 +89,7 @@ use syn::{parse_macro_input, DeriveInput}; /// ``` /// /// ``` -/// # use fyrox_core::visitor::{Visit, VisitResult, Visitor}; +/// # use fyrox_core::visitor::prelude::*; /// #[derive(Visit)] /// enum EnumExample { A, B(usize) } /// # fn main() {} @@ -98,7 +98,7 @@ use syn::{parse_macro_input, DeriveInput}; /// would expand to something like: /// /// ``` -/// # use fyrox_core::visitor::{Visit, VisitResult, Visitor}; +/// # use fyrox_core::visitor::prelude::*; /// # enum EnumExample { A, B(usize) } /// impl Visit for EnumExample { /// fn visit(&mut self, name: &str, visitor: &mut Visitor) -> VisitResult { diff --git a/fyrox-core-derive/src/visit.rs b/fyrox-core-derive/src/visit.rs index 433c0abd7..72aac65a1 100644 --- a/fyrox-core-derive/src/visit.rs +++ b/fyrox-core-derive/src/visit.rs @@ -255,6 +255,7 @@ fn impl_visit_enum(ty_args: &args::TypeArgs, variant_args: &[args::VariantArgs]) match self { #(#variant_visits)* + _ => return Err(VisitError::UnhandledEnumVariant) } return Ok(()); diff --git a/fyrox-core/src/color.rs b/fyrox-core/src/color.rs index f389b167d..c1549d089 100644 --- a/fyrox-core/src/color.rs +++ b/fyrox-core/src/color.rs @@ -21,7 +21,7 @@ use crate::{ algebra::{Vector3, Vector4}, reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }; use bytemuck::{Pod, Zeroable}; use num_traits::Zero; diff --git a/fyrox-core/src/color_gradient.rs b/fyrox-core/src/color_gradient.rs index 9a88af2d2..2e6eb57af 100644 --- a/fyrox-core/src/color_gradient.rs +++ b/fyrox-core/src/color_gradient.rs @@ -18,11 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -use crate::{ - color::Color, - reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, -}; +use crate::{color::Color, reflect::prelude::*, visitor::prelude::*}; use std::cmp::Ordering; #[derive(PartialEq, Debug, Visit, Reflect)] diff --git a/fyrox-core/src/lib.rs b/fyrox-core/src/lib.rs index d864bcc72..1668e9339 100644 --- a/fyrox-core/src/lib.rs +++ b/fyrox-core/src/lib.rs @@ -36,7 +36,7 @@ pub use rand; pub use sstorage::ImmutableString; pub use uuid; -use crate::visitor::{Visit, VisitResult, Visitor}; +use crate::visitor::prelude::*; use bytemuck::Pod; use fxhash::FxHashMap; pub use safelock::*; diff --git a/fyrox-core/src/sstorage.rs b/fyrox-core/src/sstorage.rs index 3542f82e3..51da899c2 100644 --- a/fyrox-core/src/sstorage.rs +++ b/fyrox-core/src/sstorage.rs @@ -23,11 +23,7 @@ #![warn(missing_docs)] -use crate::{ - parking_lot::Mutex, - visitor::{Visit, VisitResult, Visitor}, - SafeLock, -}; +use crate::{parking_lot::Mutex, visitor::prelude::*, SafeLock}; use fxhash::{FxHashMap, FxHasher}; use serde::{Deserialize, Serialize}; use std::{ diff --git a/fyrox-core/src/visitor/error.rs b/fyrox-core/src/visitor/error.rs index 1c24b9da3..093c3e15d 100644 --- a/fyrox-core/src/visitor/error.rs +++ b/fyrox-core/src/visitor/error.rs @@ -102,6 +102,9 @@ pub enum VisitError { UuidError(uuid::Error), /// Arbitrary error. Any(Box), + /// Unhandled enum variant. Typically, means that a match arm of non-exhaustive pattern is not + /// handled. + UnhandledEnumVariant, } impl Error for VisitError {} @@ -171,6 +174,9 @@ impl Display for VisitError { Self::Any(e) => { write!(f, "{e}") } + VisitError::UnhandledEnumVariant => { + write!(f, "unhandled enum variant") + } } } } diff --git a/fyrox-core/src/visitor/mod.rs b/fyrox-core/src/visitor/mod.rs index 6f6de9249..c783820d6 100644 --- a/fyrox-core/src/visitor/mod.rs +++ b/fyrox-core/src/visitor/mod.rs @@ -829,7 +829,7 @@ impl Visitor { #[cfg(test)] mod test { - use crate::visitor::{BinaryBlob, Visit, VisitResult, Visitor}; + use crate::visitor::{prelude::*, BinaryBlob}; use nalgebra::{ Matrix2, Matrix3, Matrix4, UnitComplex, UnitQuaternion, Vector2, Vector3, Vector4, }; diff --git a/fyrox-impl/src/resource/model/mod.rs b/fyrox-impl/src/resource/model/mod.rs index e653adc96..76509f245 100644 --- a/fyrox-impl/src/resource/model/mod.rs +++ b/fyrox-impl/src/resource/model/mod.rs @@ -53,7 +53,7 @@ use crate::{ uuid::Uuid, variable::InheritableVariable, visitor::error::VisitError, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, NameProvider, }, engine::SerializationContext, diff --git a/fyrox-impl/src/scene/base.rs b/fyrox-impl/src/scene/base.rs index 909d8900e..e3f93e263 100644 --- a/fyrox-impl/src/scene/base.rs +++ b/fyrox-impl/src/scene/base.rs @@ -31,7 +31,7 @@ use crate::{ pool::{ErasedHandle, Handle}, reflect::prelude::*, variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, ImmutableString, }, engine::SerializationContext, diff --git a/fyrox-impl/src/scene/camera.rs b/fyrox-impl/src/scene/camera.rs index 0a5e83547..01283617b 100644 --- a/fyrox-impl/src/scene/camera.rs +++ b/fyrox-impl/src/scene/camera.rs @@ -30,7 +30,7 @@ use crate::{ reflect::prelude::*, uuid::{uuid, Uuid}, variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, graph::SceneGraph, resource::texture::{ diff --git a/fyrox-impl/src/scene/graph/mod.rs b/fyrox-impl/src/scene/graph/mod.rs index 3cdf1442f..e2a51648f 100644 --- a/fyrox-impl/src/scene/graph/mod.rs +++ b/fyrox-impl/src/scene/graph/mod.rs @@ -52,7 +52,7 @@ use crate::{ math::{aabb::AxisAlignedBoundingBox, Matrix4Ext}, pool::{Handle, MultiBorrowContext, ObjectOrVariant, Pool, PoolError, Ticket}, reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, graph::{NodeHandleMap, NodeWrapper, SceneGraph}, material::{MaterialResourceBinding, MaterialTextureBinding}, diff --git a/fyrox-impl/src/scene/light/directional.rs b/fyrox-impl/src/scene/light/directional.rs index bb569f02a..710e5087d 100644 --- a/fyrox-impl/src/scene/light/directional.rs +++ b/fyrox-impl/src/scene/light/directional.rs @@ -35,7 +35,7 @@ use crate::{ reflect::prelude::*, uuid::{uuid, Uuid}, variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, scene::{ base::{Base, BaseBuilder}, diff --git a/fyrox-impl/src/scene/light/mod.rs b/fyrox-impl/src/scene/light/mod.rs index b291b6a59..f77652e1c 100644 --- a/fyrox-impl/src/scene/light/mod.rs +++ b/fyrox-impl/src/scene/light/mod.rs @@ -38,11 +38,8 @@ use crate::{ core::{ - algebra::Vector3, - color::Color, - reflect::prelude::*, - variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + algebra::Vector3, color::Color, reflect::prelude::*, variable::InheritableVariable, + visitor::prelude::*, }, scene::base::{Base, BaseBuilder}, }; diff --git a/fyrox-impl/src/scene/light/point.rs b/fyrox-impl/src/scene/light/point.rs index 4e5eae1a6..0c2c6b424 100644 --- a/fyrox-impl/src/scene/light/point.rs +++ b/fyrox-impl/src/scene/light/point.rs @@ -47,7 +47,7 @@ use crate::{ reflect::prelude::*, uuid::{uuid, Uuid}, variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, scene::{ base::Base, diff --git a/fyrox-impl/src/scene/light/spot.rs b/fyrox-impl/src/scene/light/spot.rs index f70abcc56..fe9ec347f 100644 --- a/fyrox-impl/src/scene/light/spot.rs +++ b/fyrox-impl/src/scene/light/spot.rs @@ -53,7 +53,7 @@ use crate::{ reflect::prelude::*, uuid::{uuid, Uuid}, variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, resource::texture::TextureResource, scene::{ diff --git a/fyrox-impl/src/scene/mesh/surface.rs b/fyrox-impl/src/scene/mesh/surface.rs index 8235cecfd..cb5a3f8f4 100644 --- a/fyrox-impl/src/scene/mesh/surface.rs +++ b/fyrox-impl/src/scene/mesh/surface.rs @@ -38,7 +38,7 @@ use crate::{ reflect::prelude::*, sparse::AtomicIndex, variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, material::{Material, MaterialResource, MaterialResourceExtension}, resource::texture::{TextureKind, TexturePixelKind, TextureResource, TextureResourceExtension}, diff --git a/fyrox-impl/src/scene/node/container.rs b/fyrox-impl/src/scene/node/container.rs index a58308678..58f472513 100644 --- a/fyrox-impl/src/scene/node/container.rs +++ b/fyrox-impl/src/scene/node/container.rs @@ -22,12 +22,7 @@ //! control over instantiation process at deserialization. use crate::{ - core::{ - pool::PayloadContainer, - reflect::prelude::*, - uuid::Uuid, - visitor::{Visit, VisitResult, Visitor}, - }, + core::{pool::PayloadContainer, reflect::prelude::*, uuid::Uuid, visitor::prelude::*}, engine::SerializationContext, scene::node::Node, }; diff --git a/fyrox-impl/src/scene/node/mod.rs b/fyrox-impl/src/scene/node/mod.rs index 078cf12fc..53fb91eeb 100644 --- a/fyrox-impl/src/scene/node/mod.rs +++ b/fyrox-impl/src/scene/node/mod.rs @@ -35,7 +35,7 @@ use crate::{ uuid::Uuid, variable, variable::mark_inheritable_properties_non_modified, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, NameProvider, }, graph::NodeWrapper, diff --git a/fyrox-impl/src/scene/sprite.rs b/fyrox-impl/src/scene/sprite.rs index eca638de0..15fb56447 100644 --- a/fyrox-impl/src/scene/sprite.rs +++ b/fyrox-impl/src/scene/sprite.rs @@ -33,7 +33,7 @@ use crate::{ uuid::{uuid, Uuid}, value_as_u8_slice, variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, graph::{constructor::ConstructorProvider, SceneGraph}, material::{Material, MaterialResource}, diff --git a/fyrox-impl/src/scene/transform.rs b/fyrox-impl/src/scene/transform.rs index 9b928796a..2d66a8a0b 100644 --- a/fyrox-impl/src/scene/transform.rs +++ b/fyrox-impl/src/scene/transform.rs @@ -69,7 +69,7 @@ use crate::core::{ log::{Log, MessageKind}, reflect::prelude::*, variable::InheritableVariable, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }; use std::cell::Cell; diff --git a/fyrox-impl/src/script/mod.rs b/fyrox-impl/src/script/mod.rs index 892c5df56..6880581e4 100644 --- a/fyrox-impl/src/script/mod.rs +++ b/fyrox-impl/src/script/mod.rs @@ -30,7 +30,7 @@ use crate::{ pool::{Handle, PoolError}, reflect::prelude::*, uuid::Uuid, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, engine::{input::InputState, task::TaskPoolHandler, GraphicsContext, ScriptMessageDispatcher}, event::Event, diff --git a/fyrox-impl/src/utils/navmesh.rs b/fyrox-impl/src/utils/navmesh.rs index 477ef2543..5a5a6db9d 100644 --- a/fyrox-impl/src/utils/navmesh.rs +++ b/fyrox-impl/src/utils/navmesh.rs @@ -31,7 +31,7 @@ use crate::{ arrayvec::ArrayVec, math::{self, plane::Plane, ray::Ray, PositionProvider, TriangleDefinition, Vector3Ext}, reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }, scene::mesh::{ buffer::{VertexAttributeUsage, VertexReadTrait}, diff --git a/fyrox-resource/src/constructor.rs b/fyrox-resource/src/constructor.rs index 5129980d5..8090dd2e3 100644 --- a/fyrox-resource/src/constructor.rs +++ b/fyrox-resource/src/constructor.rs @@ -107,7 +107,7 @@ impl ResourceConstructorContainer { #[cfg(test)] mod test { use fyrox_core::reflect::prelude::*; - use fyrox_core::visitor::{Visit, VisitResult, Visitor}; + use fyrox_core::visitor::prelude::*; use std::error::Error; use std::path::Path; diff --git a/fyrox-resource/src/manager.rs b/fyrox-resource/src/manager.rs index a0f1bc943..b44c07021 100644 --- a/fyrox-resource/src/manager.rs +++ b/fyrox-resource/src/manager.rs @@ -2092,7 +2092,7 @@ mod test { }; use fyrox_core::{ uuid::{uuid, Uuid}, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }; use std::{error::Error, fs::File, time::Duration}; diff --git a/fyrox-sound/src/dsp/filters.rs b/fyrox-sound/src/dsp/filters.rs index be1688965..3865d58d4 100644 --- a/fyrox-sound/src/dsp/filters.rs +++ b/fyrox-sound/src/dsp/filters.rs @@ -27,10 +27,7 @@ //! description of each filter. There is no need to describe them all here. use crate::dsp::DelayLine; -use fyrox_core::{ - reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, -}; +use fyrox_core::{reflect::prelude::*, visitor::prelude::*}; /// One-pole Filter. /// For details see - diff --git a/fyrox-sound/src/dsp/mod.rs b/fyrox-sound/src/dsp/mod.rs index 89bc3029a..1bdf638ef 100644 --- a/fyrox-sound/src/dsp/mod.rs +++ b/fyrox-sound/src/dsp/mod.rs @@ -29,7 +29,7 @@ //! `fc` - normalized frequency, i.e. `fc = 0.2` with `sample rate = 44100 Hz` will be `f = 8820 Hz` use fyrox_core::visitor::pod::PodVecView; -use fyrox_core::visitor::{Visit, VisitResult, Visitor}; +use fyrox_core::visitor::prelude::*; pub mod filters; diff --git a/fyrox-sound/src/engine.rs b/fyrox-sound/src/engine.rs index 22a13bbf7..6e28f3734 100644 --- a/fyrox-sound/src/engine.rs +++ b/fyrox-sound/src/engine.rs @@ -25,7 +25,7 @@ //! Sound engine manages contexts, feeds output device with data. use crate::context::SoundContext; -use fyrox_core::visitor::{Visit, VisitResult, Visitor}; +use fyrox_core::visitor::prelude::*; use fyrox_core::SafeLock; use std::error::Error; use std::sync::{Arc, Mutex, MutexGuard}; diff --git a/fyrox-sound/src/renderer/hrtf.rs b/fyrox-sound/src/renderer/hrtf.rs index 34fbadf85..6f37c0237 100644 --- a/fyrox-sound/src/renderer/hrtf.rs +++ b/fyrox-sound/src/renderer/hrtf.rs @@ -84,7 +84,7 @@ use fyrox_core::{ log::Log, reflect::prelude::*, uuid::{uuid, Uuid}, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }; use fyrox_resource::untyped::ResourceKind; use fyrox_resource::{ diff --git a/fyrox-sound/src/renderer/mod.rs b/fyrox-sound/src/renderer/mod.rs index ec9766b11..6a88d19a2 100644 --- a/fyrox-sound/src/renderer/mod.rs +++ b/fyrox-sound/src/renderer/mod.rs @@ -32,10 +32,7 @@ use crate::{ source::SoundSource, }; use fyrox_core::math::lerpf; -use fyrox_core::{ - reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, -}; +use fyrox_core::{reflect::prelude::*, visitor::prelude::*}; use strum_macros::{AsRefStr, EnumString, VariantNames}; pub mod hrtf; diff --git a/fyrox-sound/src/source.rs b/fyrox-sound/src/source.rs index 6bb8939d5..07860dff2 100644 --- a/fyrox-sound/src/source.rs +++ b/fyrox-sound/src/source.rs @@ -55,12 +55,7 @@ use crate::{ error::SoundError, listener::Listener, }; -use fyrox_core::{ - algebra::Vector3, - log::Log, - reflect::prelude::*, - visitor::{Visit, VisitResult, Visitor}, -}; +use fyrox_core::{algebra::Vector3, log::Log, reflect::prelude::*, visitor::prelude::*}; use std::time::Duration; /// Status (state) of sound source. diff --git a/fyrox-texture/src/lib.rs b/fyrox-texture/src/lib.rs index abd7de69f..8999c3560 100644 --- a/fyrox-texture/src/lib.rs +++ b/fyrox-texture/src/lib.rs @@ -54,7 +54,7 @@ use fyrox_core::{ reflect::prelude::*, sparse::AtomicIndex, uuid::Uuid, - visitor::{Visit, VisitResult, Visitor}, + visitor::prelude::*, }; use fyrox_resource::{ embedded_data_source, io::ResourceIo, manager::BuiltInResource, options::ImportOptions, diff --git a/fyrox-ui/src/node/container.rs b/fyrox-ui/src/node/container.rs index 7547ae63c..b700c2e92 100644 --- a/fyrox-ui/src/node/container.rs +++ b/fyrox-ui/src/node/container.rs @@ -23,12 +23,7 @@ use crate::{ constructor::WidgetConstructorContainer, - core::{ - pool::PayloadContainer, - reflect::prelude::*, - uuid::Uuid, - visitor::{Visit, VisitResult, Visitor}, - }, + core::{pool::PayloadContainer, reflect::prelude::*, uuid::Uuid, visitor::prelude::*}, UiNode, }; use fyrox_core::visitor::error::VisitError;