From 2d777a85ee3e0faeb0d1eb100391922a226cd564 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 1 Jul 2017 07:47:39 -0400 Subject: [PATCH] clean up warnings --- .../src/main/scala/sbt/internal/util/BufferedLogger.scala | 4 ++-- .../src/main/scala/sbt/internal/util/ConsoleAppender.scala | 2 +- .../src/main/scala/sbt/internal/util/ManagedLogger.scala | 2 +- .../src/main/scala/sbt/internal/scripted/ScriptedTests.scala | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala index a8399e2b6..be24152c1 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala @@ -57,7 +57,7 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append result } catch { case e: Throwable => stopQuietly(); throw e } } - def stopQuietly() = synchronized { try { stopBuffer() } catch { case e: Exception => () } } + def stopQuietly() = synchronized { try { stopBuffer() } catch { case _: Exception => () } } /** * Flushes the buffer to the delegate logger. This method calls logAll on the delegate @@ -104,7 +104,7 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger { result } catch { case e: Throwable => stopQuietly(); throw e } } - def stopQuietly() = synchronized { try { stop() } catch { case e: Exception => () } } + def stopQuietly() = synchronized { try { stop() } catch { case _: Exception => () } } /** * Flushes the buffer to the delegate logger. This method calls logAll on the delegate diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala index d730df112..e85f70fa8 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala @@ -162,7 +162,7 @@ object ConsoleAppender { terminal.restore // #460 terminal.isAnsiSupported } catch { - case e: Exception => !isWindows + case _: Exception => !isWindows // sbt 0.13 drops JLine 1.0 from the launcher and uses 2.x as a normal dependency // when 0.13 is used with a 0.12 launcher or earlier, the JLine classes from the launcher get loaded diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala index c66ceb4d2..794107111 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala @@ -1,7 +1,7 @@ package sbt.internal.util import sbt.util._ -import org.apache.logging.log4j.{ Logger => XLogger, Level => XLevel } +import org.apache.logging.log4j.{ Logger => XLogger } import org.apache.logging.log4j.message.ObjectMessage import sjsonnew.JsonFormat import scala.reflect.runtime.universe.TypeTag diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala index 81a04721a..fb1ba9eca 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala @@ -4,7 +4,7 @@ package scripted import java.io.File import sbt.util.{ Logger, LogExchange, Level } -import sbt.internal.util.{ ManagedLogger, ConsoleOut, MainAppender, ConsoleAppender, BufferedAppender } +import sbt.internal.util.{ ManagedLogger, ConsoleAppender, BufferedAppender } import sbt.io.IO.wrapNull import sbt.io.{ DirectoryFilter, HiddenFileFilter } import sbt.io.syntax._