summaryrefslogtreecommitdiff
path: root/cask/src/cask/main
diff options
context:
space:
mode:
Diffstat (limited to 'cask/src/cask/main')
-rw-r--r--cask/src/cask/main/ErrorMsgs.scala2
-rw-r--r--cask/src/cask/main/Main.scala2
-rw-r--r--cask/src/cask/main/Routes.scala2
3 files changed, 3 insertions, 3 deletions
diff --git a/cask/src/cask/main/ErrorMsgs.scala b/cask/src/cask/main/ErrorMsgs.scala
index 0d6f8c6..254f4e0 100644
--- a/cask/src/cask/main/ErrorMsgs.scala
+++ b/cask/src/cask/main/ErrorMsgs.scala
@@ -44,7 +44,7 @@ object ErrorMsgs {
for((lhs, rhs) <- args)
yield {
val lhsPadded = lhs.padTo(leftColWidth, ' ')
- val rhsPadded = rhs.lines.mkString("\n")
+ val rhsPadded = rhs.linesIterator.mkString("\n")
s"$leftIndentStr $lhsPadded $rhsPadded"
}
val mainDocSuffix = main.doc match{
diff --git a/cask/src/cask/main/Main.scala b/cask/src/cask/main/Main.scala
index e12683f..88d7a61 100644
--- a/cask/src/cask/main/Main.scala
+++ b/cask/src/cask/main/Main.scala
@@ -44,7 +44,7 @@ abstract class BaseMain{
.map { method =>
method -> DispatchTrie.construct[(Routes, Routes.EndpointMetadata[_])](0,
for ((route, metadata) <- routeList if metadata.endpoint.methods.contains(method))
- yield (Util.splitPath(metadata.endpoint.path): IndexedSeq[String], (route, metadata), metadata.endpoint.subpath)
+ yield (Util.splitPath(metadata.endpoint.path): collection.IndexedSeq[String], (route, metadata), metadata.endpoint.subpath)
)
}.toMap
diff --git a/cask/src/cask/main/Routes.scala b/cask/src/cask/main/Routes.scala
index 1a74b87..a4660a9 100644
--- a/cask/src/cask/main/Routes.scala
+++ b/cask/src/cask/main/Routes.scala
@@ -12,7 +12,7 @@ object Routes{
entryPoint: EntryPoint[T, _])
case class RoutesEndpointsMetadata[T](value: EndpointMetadata[T]*)
object RoutesEndpointsMetadata{
- implicit def initialize[T] = macro initializeImpl[T]
+ implicit def initialize[T]: RoutesEndpointsMetadata[T] = macro initializeImpl[T]
implicit def initializeImpl[T: c.WeakTypeTag](c: Context): c.Expr[RoutesEndpointsMetadata[T]] = {
import c.universe._
val router = new cask.internal.Router[c.type](c)