Replace HandleWrapper in AnyObject

This commit is contained in:
Hanno Braun 2024-03-22 21:11:29 +01:00
parent 72665a0f2e
commit 69a6ee59dd

View File

@ -4,7 +4,7 @@ use crate::{
Curve, Cycle, Face, HalfEdge, Objects, Region, Shell, Sketch, Solid, Curve, Cycle, Face, HalfEdge, Objects, Region, Shell, Sketch, Solid,
Surface, Vertex, Surface, Vertex,
}, },
storage::{Handle, HandleWrapper, ObjectId}, storage::{Handle, ObjectId},
validate::Validate, validate::Validate,
validation::{ValidationConfig, ValidationError}, validation::{ValidationConfig, ValidationError},
}; };
@ -62,7 +62,7 @@ macro_rules! any_object {
objects.$store.insert( objects.$store.insert(
handle.clone().into(), object handle.clone().into(), object
); );
handle.0.into() handle.into()
} }
)* )*
} }
@ -138,7 +138,7 @@ impl Form for Bare {
pub struct Stored; pub struct Stored;
impl Form for Stored { impl Form for Stored {
type Form<T> = HandleWrapper<T>; type Form<T> = Handle<T>;
} }
/// Implementation of [`Form`] for objects that are about to be stored /// Implementation of [`Form`] for objects that are about to be stored
@ -152,5 +152,5 @@ impl Form for Stored {
pub struct AboutToBeStored; pub struct AboutToBeStored;
impl Form for AboutToBeStored { impl Form for AboutToBeStored {
type Form<T> = (HandleWrapper<T>, T); type Form<T> = (Handle<T>, T);
} }