From 69a6ee59dd7f51db2b5792bfe55e07a17dc944f6 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 22 Mar 2024 21:11:29 +0100 Subject: [PATCH] Replace `HandleWrapper` in `AnyObject` --- crates/fj-core/src/objects/any_object.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/fj-core/src/objects/any_object.rs b/crates/fj-core/src/objects/any_object.rs index 373447689..71f60c1f1 100644 --- a/crates/fj-core/src/objects/any_object.rs +++ b/crates/fj-core/src/objects/any_object.rs @@ -4,7 +4,7 @@ use crate::{ Curve, Cycle, Face, HalfEdge, Objects, Region, Shell, Sketch, Solid, Surface, Vertex, }, - storage::{Handle, HandleWrapper, ObjectId}, + storage::{Handle, ObjectId}, validate::Validate, validation::{ValidationConfig, ValidationError}, }; @@ -62,7 +62,7 @@ macro_rules! any_object { objects.$store.insert( handle.clone().into(), object ); - handle.0.into() + handle.into() } )* } @@ -138,7 +138,7 @@ impl Form for Bare { pub struct Stored; impl Form for Stored { - type Form = HandleWrapper; + type Form = Handle; } /// Implementation of [`Form`] for objects that are about to be stored @@ -152,5 +152,5 @@ impl Form for Stored { pub struct AboutToBeStored; impl Form for AboutToBeStored { - type Form = (HandleWrapper, T); + type Form = (Handle, T); }