Skip to content

Commit 93e2a5f

Browse files
Run scalafix, now that it is working
1 parent ace53f6 commit 93e2a5f

File tree

8 files changed

+35
-19
lines changed

8 files changed

+35
-19
lines changed

collections/test/src/peschke/UnitSpec.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package peschke
22

3-
import org.scalatest.{EitherValues, OptionValues}
3+
import org.scalatest.EitherValues
4+
import org.scalatest.OptionValues
45
import org.scalatest.matchers.must.Matchers
56
import org.scalatest.wordspec.AnyWordSpec
67

core/src/peschke/Complete.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package peschke
22

3-
import cats.{Hash, Monoid, Show}
3+
import cats.Hash
4+
import cats.Monoid
5+
import cats.Show
46

57
/** Used as a replacement for returning Unit.
68
*

shims/src/peschke/shims/resource/Bracket.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package peschke.shims.resource
22

3-
import cats.{Id, Semigroup}
3+
import cats.Id
4+
import cats.Semigroup
45
import cats.syntax.all._
56
import peschke.Complete
67

7-
import scala.concurrent.{ExecutionContext, Future}
8-
import scala.util.{Failure, Success, Try}
8+
import scala.concurrent.ExecutionContext
9+
import scala.concurrent.Future
10+
import scala.util.Failure
11+
import scala.util.Success
12+
import scala.util.Try
913

1014
/** This is a poor replacement for cats-effect's MonadCancel.
1115
*

shims/src/peschke/shims/resource/Closer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package peschke.shims.resource
22

3-
import cats.syntax.all._
43
import cats.ApplicativeThrow
4+
import cats.syntax.all._
55
import peschke.Complete
66

77
import java.io.Closeable

shims/src/peschke/shims/resource/ExceptionMapper.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package peschke.shims.resource
22

3+
import cats.ApplicativeError
4+
import cats.Id
35
import cats.syntax.all._
4-
import cats.{ApplicativeError, Id}
56

67
import scala.concurrent.Future
78
import scala.util.Try
@@ -29,7 +30,7 @@ object ExceptionMapper {
2930
try fa
3031
catch {
3132
case NonFatal(ex) =>
32-
mapErrorIfPossible(ex).map(AE.raiseError[A]).getOrElse(throw ex)
33+
mapErrorIfPossible(ex).map(AE.raiseError[A]).getOrElse(throw ex) // scalafix:ok DisableSyntax.throw
3334
}
3435
}
3536

shims/src/peschke/shims/resource/Managed.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package peschke.shims.resource
22

3+
import cats.Applicative
4+
import cats.Monad
35
import cats.syntax.all._
4-
import cats.{Applicative, Monad}
56

67
/** This is a poor replacement for cats-effect's `Resource`
78
*

shims/test/src-2.13/peschke/UnitSpec.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package peschke
22

3+
import org.scalatest.EitherValues
4+
import org.scalatest.OptionValues
35
import org.scalatest.matchers.must.Matchers
46
import org.scalatest.wordspec.AnyWordSpec
5-
import org.scalatest.{EitherValues, OptionValues}
67

78
trait UnitSpec
89
extends AnyWordSpec

shims/test/src-2.13/peschke/shims/resource/ManagedTest.scala

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,17 @@ import cats.Id
44
import cats.data.Chain
55
import cats.syntax.all._
66
import org.scalatest.TryValues
7-
import peschke.shims.resource.TestResourceFactory.{Record, ResourceBuilder}
8-
import peschke.{Complete, UnitSpec}
7+
import peschke.Complete
8+
import peschke.UnitSpec
9+
import peschke.shims.resource.TestResourceFactory.Record
10+
import peschke.shims.resource.TestResourceFactory.ResourceBuilder
911

10-
import java.util.concurrent.atomic.{AtomicBoolean, AtomicReference}
12+
import java.util.concurrent.atomic.AtomicBoolean
13+
import java.util.concurrent.atomic.AtomicReference
1114
import scala.util.Try
1215

16+
// OK to throw in this test, as the code needs to behave in the presence of exceptions
17+
// scalafix:off DisableSyntax.throw
1318
class ManagedIdTest extends UnitSpec {
1419
val manage: Managed.Factory[Id, Throwable] = Managed.factory[Id, Throwable]
1520

@@ -1297,15 +1302,16 @@ object TestResourceFactory {
12971302
*/
12981303
sealed abstract class Record[A] extends Product with Serializable
12991304
object Record {
1300-
final case class SuccessfullyOpened[A]() extends Record[A]
1305+
// 'ignored: Boolean = true' is a workaround for https://github.com/scalameta/scalafmt/issues/3304
1306+
final case class SuccessfullyOpened[A](ignored: Boolean = true) extends Record[A]
13011307
final case class FailedToOpen[A](error: String) extends Record[A]
13021308
final case class SuccessfullyRetrieved[A](value: A) extends Record[A]
13031309
final case class FailedToRetrieve[A](error: String) extends Record[A]
1304-
final case class RetrieveAttemptedAfterClose[A]() extends Record[A]
1305-
final case class SuccessfullyClosed[A]() extends Record[A]
1306-
final case class FailedToClose[A]() extends Record[A]
1307-
final case class CloseAttemptedAfterClose[A]() extends Record[A]
1308-
final case class RanOutOfResources[A]() extends Record[A]
1310+
final case class RetrieveAttemptedAfterClose[A](ignored: Boolean = true) extends Record[A]
1311+
final case class SuccessfullyClosed[A](ignored: Boolean = true) extends Record[A]
1312+
final case class FailedToClose[A](ignored: Boolean = true) extends Record[A]
1313+
final case class CloseAttemptedAfterClose[A](ignored: Boolean = true) extends Record[A]
1314+
final case class RanOutOfResources[A](ignored: Boolean = true) extends Record[A]
13091315
final case class Marker[A](tag: String) extends Record[A]
13101316
}
13111317
}

0 commit comments

Comments
 (0)