diff --git a/build.sbt b/build.sbt index f0da1ac..911b811 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,8 @@ scalacOptions ++= List( "-unchecked", "-deprecation", "-language:_", - "-encoding", "UTF-8" + "-encoding", "UTF-8", + "-Ywarn-unused" ) osgiSettings diff --git a/src/main/scala/com/typesafe/scalalogging/Logger.scala b/src/main/scala/com/typesafe/scalalogging/Logger.scala index e69b352..07cda98 100644 --- a/src/main/scala/com/typesafe/scalalogging/Logger.scala +++ b/src/main/scala/com/typesafe/scalalogging/Logger.scala @@ -17,7 +17,6 @@ package com.typesafe.scalalogging import org.slf4j.{ LoggerFactory, Marker, Logger => Underlying } -import scala.language.experimental.macros import scala.reflect.ClassTag /** diff --git a/src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala b/src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala index e13a55d..1478b56 100644 --- a/src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala +++ b/src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala @@ -19,7 +19,7 @@ package com.typesafe.scalalogging import org.slf4j.Marker import scala.reflect.macros.blackbox -private object LoggerMacro { +private[scalalogging] object LoggerMacro { type LoggerContext = blackbox.Context { type PrefixType = Logger } @@ -295,7 +295,7 @@ private object LoggerMacro { case q"scala.StringContext.apply(..$parts).s(..$args)" => val format = parts.iterator.map({ case Literal(Constant(str: String)) => str }) // Emulate standard interpolator escaping - .map(StringContext.treatEscapes) + .map(StringContext.processEscapes) // Escape literal slf4j format anchors if the resulting call will require a format string .map(str => if (args.nonEmpty) str.replace("{}", "\\{}") else str) .mkString("{}") diff --git a/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala b/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala index e4a5584..873651e 100644 --- a/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala +++ b/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala @@ -1,11 +1,12 @@ package com.typesafe.scalalogging import org.slf4j.{ Marker, Logger => Underlying } -import scala.language.experimental.macros trait CanLog[A] { def logMessage(originalMsg: String, a: A): String - def afterLog(a: A): Unit = () + def afterLog(a: A): Unit = { + val _ = a + } } @SerialVersionUID(957385465L) diff --git a/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala b/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala index c046191..54ac055 100644 --- a/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala +++ b/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala @@ -3,7 +3,7 @@ package com.typesafe.scalalogging import org.slf4j.Marker import scala.reflect.macros.blackbox -private object LoggerTakingImplicitMacro { +private[scalalogging] object LoggerTakingImplicitMacro { type LoggerContext[A] = blackbox.Context { type PrefixType = LoggerTakingImplicit[A] }