Skip to content

CommutativeMonoid[Option[A]] from CommutativeSemigroup #2834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 6, 2019
+11 −5
Merged

CommutativeMonoid[Option[A]] from CommutativeSemigroup #2834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ee34154
Add FreeT.inject helper function (#1534)
valydia Feb 10, 2018
cc5a989
Rename FreeT.inject to FreeT.liftInject (#1534)
Mar 7, 2018
4f0f016
Add Free.liftInject helper function (#1534)
Mar 7, 2018
dbe8ea5
Merge branch 'master' of github.com:valydia/cats
Apr 11, 2019
7b08b66
Merge remote-tracking branch 'upstream/master'
Apr 11, 2019
cf2cb96
Merge remote-tracking branch 'upstream/master'
May 8, 2019
8791efa
Add CommutativeMonoid[Option[A]] instance (#2725)
May 8, 2019
bd00510
Update laws
May 8, 2019
be5100a
Format the codebase
May 28, 2019
ab793f1
Merge remote-tracking branch 'upstream/master'
Jul 2, 2019
8a51adb
Merge remote-tracking branch 'upstream/master'
Oct 17, 2019
3f6a62d
Merge branch 'master' into commutative-monoid-for-option
Oct 17, 2019
c08f6f4
Remove unnecessary change
Oct 17, 2019
bdee733
Make instance helper class private
travisbrown Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions kernel-laws/shared/src/test/scala/cats/kernel/laws/LawTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,8 @@ class Tests extends AnyFunSuiteLike with Discipline with ScalaVersionSpecificTes

checkAll("Monoid[String]", MonoidTests[String].monoid)
checkAll("Monoid[String]", SerializableTests.serializable(Monoid[String]))
checkAll("Monoid[Option[Int]]", MonoidTests[Option[Int]].monoid)
checkAll("Monoid[Option[Int]]", SerializableTests.serializable(Monoid[String]))
checkAll("Monoid[Option[String]]", MonoidTests[Option[String]].monoid)
checkAll("Monoid[Option[String]]", SerializableTests.serializable(Monoid[String]))
checkAll("Monoid[Option[String]]", SerializableTests.serializable(Monoid[Option[String]]))
Copy link
Contributor Author

@valydia valydia May 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looked like a copy and paste went wrong

checkAll("Monoid[List[Int]]", MonoidTests[List[Int]].monoid)
checkAll("Monoid[List[Int]]", SerializableTests.serializable(Monoid[List[Int]]))
checkAll("Monoid[Vector[Int]]", MonoidTests[Vector[Int]].monoid)
Expand All @@ -246,6 +244,8 @@ class Tests extends AnyFunSuiteLike with Discipline with ScalaVersionSpecificTes
checkAll("Monoid[Queue[Int]]", MonoidTests[Queue[Int]].monoid)
checkAll("Monoid[Queue[Int]]", SerializableTests.serializable(Monoid[Queue[Int]]))

checkAll("CommutativeMonoid[Option[Int]]", CommutativeMonoidTests[Option[Int]].commutativeMonoid)
checkAll("CommutativeMonoid[Option[Int]]", SerializableTests.serializable(CommutativeMonoid[Option[Int]]))
checkAll("CommutativeMonoid[Map[String, Int]]", CommutativeMonoidTests[Map[String, Int]].commutativeMonoid)
checkAll("CommutativeMonoid[Map[String, Int]]", SerializableTests.serializable(CommutativeMonoid[Map[String, Int]]))
checkAll("CommutativeMonoid[SortedMap[String, Int]]",
Expand Down
10 changes: 8 additions & 2 deletions kernel/src/main/scala/cats/kernel/instances/OptionInstances.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ package instances
trait OptionInstances extends OptionInstances0 {
implicit def catsKernelStdOrderForOption[A: Order]: Order[Option[A]] =
new OptionOrder[A]
implicit def catsKernelStdMonoidForOption[A: Semigroup]: Monoid[Option[A]] =
new OptionMonoid[A]
implicit def catsKernelStdCommutativeMonoidForOption[A: CommutativeSemigroup]: CommutativeMonoid[Option[A]] =
new OptionCommutativeMonoid[A]
}

private[instances] trait OptionInstances0 extends OptionInstances1 {
implicit def catsKernelStdPartialOrderForOption[A: PartialOrder]: PartialOrder[Option[A]] =
new OptionPartialOrder[A]
implicit def catsKernelStdMonoidForOption[A: Semigroup]: Monoid[Option[A]] =
new OptionMonoid[A]
}

private[instances] trait OptionInstances1 extends OptionInstances2 {
Expand Down Expand Up @@ -80,3 +82,7 @@ class OptionMonoid[A](implicit A: Semigroup[A]) extends Monoid[Option[A]] {
}
}
}

private class OptionCommutativeMonoid[A](implicit A: CommutativeSemigroup[A])
extends OptionMonoid[A]()(A)
with CommutativeMonoid[Option[A]]