aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2017-11-08 18:28:43 -0800
committerJakob Odersky <jakob@driver.xyz>2017-11-08 18:30:05 -0800
commit574cda580870d21de506eecf0ac9dd25bdc4be72 (patch)
tree9c5d7e27ea5c05fa6e12c2ddfc0a1f302b8d9030 /src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
parent1a172285403e77658db9d0331a5b7235946b90eb (diff)
downloadrest-query-0.14.0.tar.gz
rest-query-0.14.0.tar.bz2
rest-query-0.14.0.zip
Upgrade sbt settings and support Scala 2.12v0.14.0
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
index 4bfc669..a04d278 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
@@ -49,7 +49,7 @@ object SortingParser {
val parser = sequentialSortingParser(validDimensions.toSeq)
parser.parse(rawSorting) match {
case Parsed.Success(x, _) => x
- case e: Parsed.Failure =>
+ case e: Parsed.Failure[_, _] =>
throw new ParseQueryArgException("sort" -> formatFailure(e))
}
@@ -57,8 +57,8 @@ object SortingParser {
}
}
- private def formatFailure(e: Parsed.Failure): String = {
- ParseError.msg(e.extra.input, e.extra.traced.expected, e.index)
+ private def formatFailure(e: Parsed.Failure[_, _]): String = {
+ fastparse.core.ParseError.msg(e.extra.input, e.extra.traced.expected, e.index)
}
}