luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from dwijnand/StringTypeTag-opt-test-enforcement 

Enforce invariant in StringTypeTag optimisation
This commit is contained in:
eugene yokota 2018-04-05 10:45:34 -04:00 committed by GitHub
parent 93d2b77922 029952895b
commit a0ef0c02d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
internal/util-logging/src/main/scala/sbt/util/LogExchange.scala
View File

@ -62,20 +62,21 @@ sealed abstract class LogExchange {
config.getLoggerConfig(loggerName)
}
// Construct these StringTypeTags manually, because they're used at the very startup of sbt
// and we'll try not to initialize the universe by using the StringTypeTag.apply that requires a TypeTag
// A better long-term solution could be to make StringTypeTag.apply a macro.
lazy val stringTypeTagThrowable = StringTypeTag[Throwable]("scala.Throwable")
lazy val stringTypeTagTraceEvent = StringTypeTag[TraceEvent]("sbt.internal.util.TraceEvent")
lazy val stringTypeTagSuccessEvent = StringTypeTag[SuccessEvent]("sbt.internal.util.SuccessEvent")
private[sbt] def initStringCodecs(): Unit = {
import sbt.internal.util.codec.ThrowableShowLines._
import sbt.internal.util.codec.TraceEventShowLines._
import sbt.internal.util.codec.SuccessEventShowLines._
// Register these StringCodecs manually, because this method will be called at the very startup of sbt
// and we'll try not to initialize the universe in StringTypeTag.apply
// If these classes are moved around, both the fully qualified names and the strings need to be adapted.
// A better long-term solution could be to make StringTypeTag.apply a macro.
registerStringCodecByStringTypeTag[_root_.scala.Throwable](StringTypeTag("scala.Throwable"))
registerStringCodecByStringTypeTag[_root_.sbt.internal.util.TraceEvent](
StringTypeTag("sbt.internal.util.TraceEvent"))
registerStringCodecByStringTypeTag[_root_.sbt.internal.util.SuccessEvent](
StringTypeTag("sbt.internal.util.SuccessEvent"))
registerStringCodecByStringTypeTag(stringTypeTagThrowable)
registerStringCodecByStringTypeTag(stringTypeTagTraceEvent)
registerStringCodecByStringTypeTag(stringTypeTagSuccessEvent)
}
// This is a dummy layout to avoid casting error during PatternLayout.createDefaultLayout()

16
internal/util-logging/src/test/scala/LogExchangeSpec.scala Normal file
View File

@ -0,0 +1,16 @@
package sbt.util
import sbt.internal.util._
import org.scalatest._
class LogExchangeSpec extends FlatSpec with Matchers {
import LogExchange._
checkTypeTag("stringTypeTagThrowable", stringTypeTagThrowable, StringTypeTag[Throwable])
checkTypeTag("stringTypeTagTraceEvent", stringTypeTagTraceEvent, StringTypeTag[TraceEvent])
checkTypeTag("stringTypeTagSuccessEvent", stringTypeTagSuccessEvent, StringTypeTag[SuccessEvent])
private def checkTypeTag[A, B](name: String, actual: A, expected: B): Unit =
s"LogExchange.$name" should s"match real StringTypeTag[$expected]" in assert(actual == expected)
}