From 055ff77e5b52bc4d07d75ecbaec0513def5fb0b7 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 5 Apr 2016 16:24:38 +0200 Subject: [PATCH] Cleaning --- build.sbt | 3 +++ .../src/main/scala/coursier/core/ResolutionProcess.scala | 3 ++- core/shared/src/main/scala/coursier/util/Parse.scala | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index dc7b5a0ef..164c0e1d2 100644 --- a/build.sbt +++ b/build.sbt @@ -146,6 +146,9 @@ lazy val core = crossProject import com.typesafe.tools.mima.core.ProblemFilters._ Seq( + // Since 1.0.0-M11 + // method made final (for - non critical - tail recursion) + ProblemFilters.exclude[FinalMethodProblem]("coursier.core.ResolutionProcess.next"), // Since 1.0.0-M10 ProblemFilters.exclude[IncompatibleResultTypeProblem]("coursier.core.Resolution.withParentConfigurations"), // New singleton object, problem for forward compatibility only diff --git a/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala b/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala index 8d6f3b43f..abe50782a 100644 --- a/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala +++ b/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala @@ -33,7 +33,8 @@ sealed abstract class ResolutionProcess { } } - def next[F[_]]( + @tailrec + final def next[F[_]]( fetch: Fetch.Metadata[F] )(implicit F: Monad[F] diff --git a/core/shared/src/main/scala/coursier/util/Parse.scala b/core/shared/src/main/scala/coursier/util/Parse.scala index 2b2f0c653..2abe3ebab 100644 --- a/core/shared/src/main/scala/coursier/util/Parse.scala +++ b/core/shared/src/main/scala/coursier/util/Parse.scala @@ -49,7 +49,7 @@ object Parse { case Right(modVer) => values += modVer } - (errors.toSeq, values.toSeq) + (errors, values) } /** @@ -77,7 +77,7 @@ object Parse { .map((_, version)) case _ => - Left(s"Malformed coordinates: $s") + Left(s"Malformed dependency: $s") } } @@ -107,7 +107,7 @@ object Parse { .map((_, version, None)) case _ => - Left(s"Malformed coordinates: $s") + Left(s"Malformed dependency: $s") } }