From e0e15857b93b5fe201c9d82bf23160e38d604b45 Mon Sep 17 00:00:00 2001
From: Eric Meisel <eric.steven.meisel@gmail.com>
Date: Wed, 29 Jan 2020 19:27:37 -0600
Subject: [PATCH 1/2] -Ywarn-unused testing

---
 build.sbt                                                     | 3 ++-
 src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala    | 2 +-
 .../com/typesafe/scalalogging/LoggerTakingImplicit.scala      | 4 +++-
 .../com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

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/LoggerMacro.scala b/src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala
index e13a55d..47fc203 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 }
 
diff --git a/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala b/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala
index e4a5584..e07b7d9 100644
--- a/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala
+++ b/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala
@@ -5,7 +5,9 @@ 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] }
 

From 738fd6b63e38f364e8bf13768aced02cb9d04cee Mon Sep 17 00:00:00 2001
From: Eric Meisel <eric.steven.meisel@gmail.com>
Date: Wed, 29 Jan 2020 19:32:54 -0600
Subject: [PATCH 2/2] Remove unused imports, deprecated function call

---
 src/main/scala/com/typesafe/scalalogging/Logger.scala           | 1 -
 src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala      | 2 +-
 .../scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala  | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

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 47fc203..1478b56 100644
--- a/src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala
+++ b/src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala
@@ -295,7 +295,7 @@ private[scalalogging] 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 e07b7d9..873651e 100644
--- a/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala
+++ b/src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicit.scala
@@ -1,7 +1,6 @@
 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