From 3af0e9d92bd3385106c712ca7c0a32188edea8ae Mon Sep 17 00:00:00 2001
From: Gabriel Omar Cotelli <g.cotelli@gmail.com>
Date: Tue, 8 Aug 2023 09:47:51 -0300
Subject: [PATCH] Move OrderedSet>>#with:with: and variants to main package

---
 .../OrderedSet.extension.st                   | 31 -------------------
 source/Buoy-Collections/OrderedSet.class.st   | 30 ++++++++++++++++++
 2 files changed, 30 insertions(+), 31 deletions(-)
 delete mode 100644 source/Buoy-Collections-GS64-Extensions/OrderedSet.extension.st

diff --git a/source/Buoy-Collections-GS64-Extensions/OrderedSet.extension.st b/source/Buoy-Collections-GS64-Extensions/OrderedSet.extension.st
deleted file mode 100644
index c52bd55..0000000
--- a/source/Buoy-Collections-GS64-Extensions/OrderedSet.extension.st
+++ /dev/null
@@ -1,31 +0,0 @@
-Extension { #name : #OrderedSet }
-
-{ #category : #'*Buoy-Collections-GS64-Extensions' }
-OrderedSet class >> with: firstObject with: secondObject [
-
-	^ self new
-		  add: firstObject;
-		  add: secondObject;
-		  yourself
-]
-
-{ #category : #'*Buoy-Collections-GS64-Extensions' }
-OrderedSet class >> with: firstObject with: secondObject with: thirdObject [
-
-	^ self new
-		  add: firstObject;
-		  add: secondObject;
-		  add: thirdObject;
-		  yourself
-]
-
-{ #category : #'*Buoy-Collections-GS64-Extensions' }
-OrderedSet class >> with: firstObject with: secondObject with: thirdObject with: fourthObject [
-
-	^ self new
-		  add: firstObject;
-		  add: secondObject;
-		  add: thirdObject;
-		  add: fourthObject;
-		  yourself
-]
diff --git a/source/Buoy-Collections/OrderedSet.class.st b/source/Buoy-Collections/OrderedSet.class.st
index 5e74961..60235fa 100644
--- a/source/Buoy-Collections/OrderedSet.class.st
+++ b/source/Buoy-Collections/OrderedSet.class.st
@@ -28,6 +28,36 @@ OrderedSet class >> newFrom: aCollection [
 	^ self withAll: aCollection
 ]
 
+{ #category : #'instance creation' }
+OrderedSet class >> with: firstObject with: secondObject [
+
+	^ self new
+		  add: firstObject;
+		  add: secondObject;
+		  yourself
+]
+
+{ #category : #'instance creation' }
+OrderedSet class >> with: firstObject with: secondObject with: thirdObject [
+
+	^ self new
+		  add: firstObject;
+		  add: secondObject;
+		  add: thirdObject;
+		  yourself
+]
+
+{ #category : #'instance creation' }
+OrderedSet class >> with: firstObject with: secondObject with: thirdObject with: fourthObject [
+
+	^ self new
+		  add: firstObject;
+		  add: secondObject;
+		  add: thirdObject;
+		  add: fourthObject;
+		  yourself
+]
+
 { #category : #copying }
 OrderedSet >> , aCollection [