Merge pull request #1181 from armanbilge/feature/allbutcats

Add `allButCats` syntax
typelevel · Jun 17, 2022 · d370e95 · d370e95
2 parents 2ccd1f1 + 7b8dc03
commit d370e95
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/core/src/main/scala-2/spire/syntax/Syntax.scala b/core/src/main/scala-2/spire/syntax/Syntax.scala
@@ -295,22 +295,16 @@ trait LiteralsSyntax {
   object eu { implicit def euLiterals(s: StringContext): EuLiterals = new EuLiterals(s) }
 }
 
-trait AllSyntax
+trait AllButCatsSyntax
     extends LiteralsSyntax
     with CforSyntax
-    with EqSyntax
-    with PartialOrderSyntax
-    with OrderSyntax
     with SignedSyntax
     with TruncatedDivisionSyntax
     with InvolutionSyntax
     with IsRealSyntax
     with ConvertableFromSyntax
     with SemigroupoidSyntax
     with GroupoidSyntax
-    with SemigroupSyntax
-    with MonoidSyntax
-    with GroupSyntax
     with AdditiveSemigroupSyntax
     with AdditiveMonoidSyntax
     with AdditiveGroupSyntax
@@ -351,3 +345,12 @@ trait AllSyntax
     with BigIntSyntax
     with ArraySyntax
     with SeqSyntax
+
+trait AllSyntax
+    extends AllButCatsSyntax
+    with EqSyntax
+    with PartialOrderSyntax
+    with OrderSyntax
+    with SemigroupSyntax
+    with MonoidSyntax
+    with GroupSyntax
diff --git a/core/src/main/scala-3/spire/syntax/Syntax.scala b/core/src/main/scala-3/spire/syntax/Syntax.scala
@@ -331,22 +331,16 @@ trait LiteralsSyntax {
 
 }
 
-trait AllSyntax
+trait AllButCatsSyntax
     extends LiteralsSyntax
     with CforSyntax
-    with EqSyntax
-    with PartialOrderSyntax
-    with OrderSyntax
     with SignedSyntax
     with TruncatedDivisionSyntax
     with InvolutionSyntax
     with IsRealSyntax
     with ConvertableFromSyntax
     with SemigroupoidSyntax
     with GroupoidSyntax
-    with SemigroupSyntax
-    with MonoidSyntax
-    with GroupSyntax
     with AdditiveSemigroupSyntax
     with AdditiveMonoidSyntax
     with AdditiveGroupSyntax
@@ -387,3 +381,12 @@ trait AllSyntax
     with BigIntSyntax
     with ArraySyntax
     with SeqSyntax
+
+trait AllSyntax
+    extends AllButCatsSyntax
+    with EqSyntax
+    with PartialOrderSyntax
+    with OrderSyntax
+    with SemigroupSyntax
+    with MonoidSyntax
+    with GroupSyntax
diff --git a/core/src/main/scala/spire/syntax/package.scala b/core/src/main/scala/spire/syntax/package.scala
@@ -79,6 +79,7 @@ package object syntax {
   object numeric extends NumericSyntax
 
   object all extends AllSyntax
+  object allButCats extends AllButCatsSyntax
 
   @deprecated("Unbound syntax will be removed", "spire 0.18.0")
   object unbound extends UnboundSyntax