handle non-exhaustive enums in Visit proc-macro correctly

editor/src/configurator.rs

@@ -20,11 +20,7 @@
 
 use crate::{
     fyrox::{
-        core::{
+        core::{algebra::Vector2, pool::Handle, visitor::prelude::*},
-            algebra::Vector2,
-            pool::Handle,
-            visitor::{Visit, VisitResult, Visitor},
-        },
         gui::{
             border::BorderBuilder,
             button::{ButtonBuilder, ButtonMessage},

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,

fyrox-animation/src/machine/mod.rs

@@ -26,10 +26,7 @@
 #![warn(missing_docs)]
 
 use crate::{
-    core::{
+    core::{reflect::prelude::*, visitor::prelude::*},
-        reflect::prelude::*,
-        visitor::{Visit, VisitResult, Visitor},
-    },
     Animation, AnimationContainer, AnimationPose, EntityId,
 };
 use fxhash::FxHashSet;

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,

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<T: Visit> {
 ///     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<T> { example_one: String, example_two: T,}
 /// impl<T> Visit for Foo<T> 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 {

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(());

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;

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::{
+use crate::{color::Color, reflect::prelude::*, visitor::prelude::*};
-    color::Color,
-    reflect::prelude::*,
-    visitor::{Visit, VisitResult, Visitor},
-};
 use std::cmp::Ordering;
 
 #[derive(PartialEq, Debug, Visit, Reflect)]

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::*;

fyrox-core/src/sstorage.rs

@@ -23,11 +23,7 @@
 
 #![warn(missing_docs)]
 
-use crate::{
+use crate::{parking_lot::Mutex, visitor::prelude::*, SafeLock};
-    parking_lot::Mutex,
-    visitor::{Visit, VisitResult, Visitor},
-    SafeLock,
-};
 use fxhash::{FxHashMap, FxHasher};
 use serde::{Deserialize, Serialize};
 use std::{

fyrox-core/src/visitor/error.rs

@@ -102,6 +102,9 @@ pub enum VisitError {
     UuidError(uuid::Error),
     /// Arbitrary error.
     Any(Box<dyn Error + Send + Sync>),
+    /// 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")
+            }
         }
     }
 }

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,
     };

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,

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,

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::{

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},

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},

fyrox-impl/src/scene/light/mod.rs

@@ -38,11 +38,8 @@
 
 use crate::{
     core::{
-        algebra::Vector3,
+        algebra::Vector3, color::Color, reflect::prelude::*, variable::InheritableVariable,
-        color::Color,
+        visitor::prelude::*,
-        reflect::prelude::*,
-        variable::InheritableVariable,
-        visitor::{Visit, VisitResult, Visitor},
     },
     scene::base::{Base, BaseBuilder},
 };

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,

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::{

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},

fyrox-impl/src/scene/node/container.rs

@@ -22,12 +22,7 @@
 //! control over instantiation process at deserialization.
 
 use crate::{
-    core::{
+    core::{pool::PayloadContainer, reflect::prelude::*, uuid::Uuid, visitor::prelude::*},
-        pool::PayloadContainer,
-        reflect::prelude::*,
-        uuid::Uuid,
-        visitor::{Visit, VisitResult, Visitor},
-    },
     engine::SerializationContext,
     scene::node::Node,
 };

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,

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},

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;
 

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,

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},

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;
 

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};
 

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::{
+use fyrox_core::{reflect::prelude::*, visitor::prelude::*};
-    reflect::prelude::*,
-    visitor::{Visit, VisitResult, Visitor},
-};
 
 /// One-pole Filter.
 /// For details see - <https://www.earlevel.com/main/2012/12/15/a-one-pole-filter/>

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;
 

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};

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::{

fyrox-sound/src/renderer/mod.rs

@@ -32,10 +32,7 @@ use crate::{
     source::SoundSource,
 };
 use fyrox_core::math::lerpf;
-use fyrox_core::{
+use fyrox_core::{reflect::prelude::*, visitor::prelude::*};
-    reflect::prelude::*,
-    visitor::{Visit, VisitResult, Visitor},
-};
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 pub mod hrtf;

fyrox-sound/src/source.rs

@@ -55,12 +55,7 @@ use crate::{
     error::SoundError,
     listener::Listener,
 };
-use fyrox_core::{
+use fyrox_core::{algebra::Vector3, log::Log, reflect::prelude::*, visitor::prelude::*};
-    algebra::Vector3,
-    log::Log,
-    reflect::prelude::*,
-    visitor::{Visit, VisitResult, Visitor},
-};
 use std::time::Duration;
 
 /// Status (state) of sound source.

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,

fyrox-ui/src/node/container.rs

@@ -23,12 +23,7 @@
 
 use crate::{
     constructor::WidgetConstructorContainer,
-    core::{
+    core::{pool::PayloadContainer, reflect::prelude::*, uuid::Uuid, visitor::prelude::*},
-        pool::PayloadContainer,
-        reflect::prelude::*,
-        uuid::Uuid,
-        visitor::{Visit, VisitResult, Visitor},
-    },
     UiNode,
 };
 use fyrox_core::visitor::error::VisitError;