diff --git a/fj/src/shape_3d.rs b/fj/src/shape_3d.rs index 5c49d92e8..83bb52dc4 100644 --- a/fj/src/shape_3d.rs +++ b/fj/src/shape_3d.rs @@ -11,7 +11,7 @@ pub enum Shape3d { Transform(Box), /// The union of two 3-dimensional shapes - Union(Box), + Union(Box), } impl From for Shape { @@ -114,7 +114,7 @@ impl From for Shape3d { /// #[derive(Clone, Debug)] #[repr(C)] -pub struct Union { +pub struct Group { /// The first of the shapes pub a: Shape3d, @@ -122,14 +122,14 @@ pub struct Union { pub b: Shape3d, } -impl From for Shape { - fn from(shape: Union) -> Self { +impl From for Shape { + fn from(shape: Group) -> Self { Self::Shape3d(Shape3d::Union(Box::new(shape))) } } -impl From for Shape3d { - fn from(shape: Union) -> Self { +impl From for Shape3d { + fn from(shape: Group) -> Self { Self::Union(Box::new(shape)) } } diff --git a/fj/src/syntax.rs b/fj/src/syntax.rs index b62a693cf..bfc0b05c0 100644 --- a/fj/src/syntax.rs +++ b/fj/src/syntax.rs @@ -71,7 +71,7 @@ where } pub trait Union { - fn union(&self, other: &Other) -> crate::Union + fn union(&self, other: &Other) -> crate::Group where Other: Clone + Into; } @@ -80,13 +80,13 @@ impl Union for T where T: Clone + Into, { - fn union(&self, other: &Other) -> crate::Union + fn union(&self, other: &Other) -> crate::Group where Other: Clone + Into, { let a = self.clone().into(); let b = other.clone().into(); - crate::Union { a, b } + crate::Group { a, b } } } diff --git a/src/kernel/shapes/union.rs b/src/kernel/shapes/union.rs index 0bcdcb2b2..9b2fffe25 100644 --- a/src/kernel/shapes/union.rs +++ b/src/kernel/shapes/union.rs @@ -15,7 +15,7 @@ use crate::{ use super::ToShape; -impl ToShape for fj::Union { +impl ToShape for fj::Group { fn to_shape(&self, tolerance: Scalar, debug_info: &mut DebugInfo) -> Shape { let mut shape = Shape::new();