From 37402d5f4e6666834fa88f840bd67aea95b32a55 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Wed, 16 Mar 2022 15:36:03 +0100
Subject: [PATCH] Update group syntax

---
 fj/src/syntax.rs                     | 4 ++--
 models/csg-union-disjoint/src/lib.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fj/src/syntax.rs b/fj/src/syntax.rs
index bfc0b05c0..2a206821e 100644
--- a/fj/src/syntax.rs
+++ b/fj/src/syntax.rs
@@ -71,7 +71,7 @@ where
 }
 
 pub trait Union {
-    fn union<Other>(&self, other: &Other) -> crate::Group
+    fn group<Other>(&self, other: &Other) -> crate::Group
     where
         Other: Clone + Into<crate::Shape3d>;
 }
@@ -80,7 +80,7 @@ impl<T> Union for T
 where
     T: Clone + Into<crate::Shape3d>,
 {
-    fn union<Other>(&self, other: &Other) -> crate::Group
+    fn group<Other>(&self, other: &Other) -> crate::Group
     where
         Other: Clone + Into<crate::Shape3d>,
     {
diff --git a/models/csg-union-disjoint/src/lib.rs b/models/csg-union-disjoint/src/lib.rs
index bda316c43..44787073d 100644
--- a/models/csg-union-disjoint/src/lib.rs
+++ b/models/csg-union-disjoint/src/lib.rs
@@ -15,7 +15,7 @@ pub extern "C" fn model(_: &HashMap<String, String>) -> fj::Shape {
     let cube_a = fj::Sketch::from_points(vertices).sweep(1.0);
     let cube_b = cube_a.clone().translate([1.5, 0., 0.5]);
 
-    let disjoint_union = cube_a.union(&cube_b);
+    let disjoint_union = cube_a.group(&cube_b);
 
     disjoint_union.into()
 }