Skip to content

Commit d370e95

Browse files
authored
Merge pull request #1181 from armanbilge/feature/allbutcats
Add `allButCats` syntax
2 parents 2ccd1f1 + 7b8dc03 commit d370e95

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

core/src/main/scala-2/spire/syntax/Syntax.scala

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,22 +295,16 @@ trait LiteralsSyntax {
295295
object eu { implicit def euLiterals(s: StringContext): EuLiterals = new EuLiterals(s) }
296296
}
297297

298-
trait AllSyntax
298+
trait AllButCatsSyntax
299299
extends LiteralsSyntax
300300
with CforSyntax
301-
with EqSyntax
302-
with PartialOrderSyntax
303-
with OrderSyntax
304301
with SignedSyntax
305302
with TruncatedDivisionSyntax
306303
with InvolutionSyntax
307304
with IsRealSyntax
308305
with ConvertableFromSyntax
309306
with SemigroupoidSyntax
310307
with GroupoidSyntax
311-
with SemigroupSyntax
312-
with MonoidSyntax
313-
with GroupSyntax
314308
with AdditiveSemigroupSyntax
315309
with AdditiveMonoidSyntax
316310
with AdditiveGroupSyntax
@@ -351,3 +345,12 @@ trait AllSyntax
351345
with BigIntSyntax
352346
with ArraySyntax
353347
with SeqSyntax
348+
349+
trait AllSyntax
350+
extends AllButCatsSyntax
351+
with EqSyntax
352+
with PartialOrderSyntax
353+
with OrderSyntax
354+
with SemigroupSyntax
355+
with MonoidSyntax
356+
with GroupSyntax

core/src/main/scala-3/spire/syntax/Syntax.scala

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,22 +331,16 @@ trait LiteralsSyntax {
331331

332332
}
333333

334-
trait AllSyntax
334+
trait AllButCatsSyntax
335335
extends LiteralsSyntax
336336
with CforSyntax
337-
with EqSyntax
338-
with PartialOrderSyntax
339-
with OrderSyntax
340337
with SignedSyntax
341338
with TruncatedDivisionSyntax
342339
with InvolutionSyntax
343340
with IsRealSyntax
344341
with ConvertableFromSyntax
345342
with SemigroupoidSyntax
346343
with GroupoidSyntax
347-
with SemigroupSyntax
348-
with MonoidSyntax
349-
with GroupSyntax
350344
with AdditiveSemigroupSyntax
351345
with AdditiveMonoidSyntax
352346
with AdditiveGroupSyntax
@@ -387,3 +381,12 @@ trait AllSyntax
387381
with BigIntSyntax
388382
with ArraySyntax
389383
with SeqSyntax
384+
385+
trait AllSyntax
386+
extends AllButCatsSyntax
387+
with EqSyntax
388+
with PartialOrderSyntax
389+
with OrderSyntax
390+
with SemigroupSyntax
391+
with MonoidSyntax
392+
with GroupSyntax

core/src/main/scala/spire/syntax/package.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ package object syntax {
7979
object numeric extends NumericSyntax
8080

8181
object all extends AllSyntax
82+
object allButCats extends AllButCatsSyntax
8283

8384
@deprecated("Unbound syntax will be removed", "spire 0.18.0")
8485
object unbound extends UnboundSyntax

0 commit comments

Comments
 (0)