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

Jump to bottom

Add Duration Instances to cats.instances.all and cats.implicits #2515

Merged
merged 2 commits into from
Sep 28, 2018
Merged

Add Duration Instances to cats.instances.all and cats.implicits #2515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdbeba0
Add Duration Instances to cats.instances.all and cats.implicits
Sep 19, 2018
a231814
Merge branch 'master' into duration
Sep 27, 2018
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
1 change: 1 addition & 0 deletions core/src/main/scala/cats/implicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ object implicits
with instances.AllInstances
with instances.AllInstancesBinCompat0
with instances.AllInstancesBinCompat1
with instances.AllInstancesBinCompat2
3 changes: 3 additions & 0 deletions core/src/main/scala/cats/instances/all.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ trait AllInstancesBinCompat1
with StreamInstancesBinCompat0
with MapInstancesBinCompat0
with SortedMapInstancesBinCompat0

trait AllInstancesBinCompat2
extends DurationInstances
2 changes: 1 addition & 1 deletion core/src/main/scala/cats/instances/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cats

package object instances {
object all extends AllInstances with AllInstancesBinCompat0 with AllInstancesBinCompat1
object all extends AllInstances with AllInstancesBinCompat0 with AllInstancesBinCompat1 with AllInstancesBinCompat2
object bigInt extends BigIntInstances
object bigDecimal extends BigDecimalInstances
object bitSet extends BitSetInstances
Expand Down
5 changes: 3 additions & 2 deletions testkit/src/main/scala/cats/tests/CatsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package cats
package tests

import catalysts.Platform
import cats.instances.{AllInstances, AllInstancesBinCompat0, AllInstancesBinCompat1}

import cats.instances.{AllInstances, AllInstancesBinCompat0, AllInstancesBinCompat1, AllInstancesBinCompat2}
import cats.syntax.{AllSyntax, AllSyntaxBinCompat0, AllSyntaxBinCompat1, AllSyntaxBinCompat2, AllSyntaxBinCompat3, EqOps}
import org.scalactic.anyvals.{PosInt, PosZDouble, PosZInt}
import org.scalatest.{FunSuite, FunSuiteLike, Matchers}
Expand Down Expand Up @@ -33,7 +34,7 @@ trait CatsSuite extends FunSuite
with GeneratorDrivenPropertyChecks
with Discipline
with TestSettings
with AllInstances with AllInstancesBinCompat0 with AllInstancesBinCompat1
with AllInstances with AllInstancesBinCompat0 with AllInstancesBinCompat1 with AllInstancesBinCompat2
with AllSyntax with AllSyntaxBinCompat0 with AllSyntaxBinCompat1
with AllSyntaxBinCompat2 with AllSyntaxBinCompat3
with StrictCatsEquality { self: FunSuiteLike =>
Expand Down
1 change: 0 additions & 1 deletion tests/src/test/scala/cats/tests/DurationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cats
package tests

import cats.instances.duration._
import cats.laws.discipline.SerializableTests

import scala.concurrent.duration.{Duration, DurationInt}
Expand Down