Skip to content
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

MonadError instance for Ior #1548

Merged
merged 13 commits into from
Apr 9, 2017
Merged

MonadError instance for Ior #1548

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
344e232
Added MonadError instance for Ior
leandrob13 Mar 8, 2017
564c4ec
Revert "Added MonadError instance for Ior"
leandrob13 Mar 19, 2017
0e17151
Merge branch 'master' into iorMonadError
leandrob13 Mar 19, 2017
0f77e85
Added MonadError instance for Ior without mixing Traverse
leandrob13 Mar 19, 2017
b72d741
Removed Monad instance
leandrob13 Mar 19, 2017
43077d5
Added MonadError tests to Ior
leandrob13 Mar 19, 2017
213452a
Added MonadErrorTests for Ior
leandrob13 Mar 19, 2017
ededf7a
Revert "Added MonadErrorTests for Ior"
leandrob13 Mar 19, 2017
6c58070
Separated Traverse instance from ApplicativeError instance for Validated
leandrob13 Mar 19, 2017
a48b04c
Added test for ior valueOr
leandrob13 Mar 20, 2017
9ead46f
Conflict resolution
leandrob13 Apr 7, 2017
b2d3e46
Fixed some slastyle comments
leandrob13 Apr 7, 2017
d23e374
Deleted duplicated import
leandrob13 Apr 8, 2017
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
3 changes: 1 addition & 2 deletions core/src/main/scala/cats/data/Validated.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ private[data] sealed abstract class ValidatedInstances extends ValidatedInstance
fab.leftMap(f)
}

// scalastyle:off method.length
implicit def catsDataApplicativeErrorForValidated[E](implicit E: Semigroup[E]): ApplicativeError[Validated[E, ?], E] =
new ApplicativeError[Validated[E, ?], E] {

Expand All @@ -322,7 +321,6 @@ private[data] sealed abstract class ValidatedInstances extends ValidatedInstance
}
def raiseError[A](e: E): Validated[E, A] = Validated.Invalid(e)
}
// scalastyle:on method.length
}

private[data] sealed abstract class ValidatedInstances1 extends ValidatedInstances2 {
Expand Down Expand Up @@ -393,6 +391,7 @@ private[data] sealed abstract class ValidatedInstances2 {

override def isEmpty[A](fa: Validated[E, A]): Boolean = fa.isInvalid
}
// scalastyle:off method.length
}

private[data] trait ValidatedFunctions {
Expand Down
4 changes: 2 additions & 2 deletions tests/src/test/scala/cats/tests/IorTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package cats
package tests

import cats.data.{EitherT, Ior}
import cats.kernel.laws.GroupLaws
import cats.laws.discipline.{BifunctorTests, CartesianTests, MonadErrorTests, SerializableTests, TraverseTests}
import cats.data.{Ior, NonEmptyList, EitherT}
import cats.kernel.laws.GroupLaws
Copy link
Collaborator

Choose a reason for hiding this comment

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

You had this import already on line 4 it seems.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@peterneyens darn it. That one must have slipped when I merged. I'm on it.

import cats.laws.discipline.arbitrary._
import cats.laws.discipline.{BifunctorTests, CartesianTests, MonadTests, SerializableTests, TraverseTests}
import org.scalacheck.Arbitrary._

class IorTests extends CatsSuite {
Expand Down