Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions compiler/test/dotty/tools/dotc/reporting/TestReporter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
final def messages: Iterator[String] = _messageBuf.iterator

protected final val _consoleBuf = new StringWriter
protected final val _consoleReporter = new ConsoleReporter(null, new PrintWriter(_consoleBuf)):
protected final val _consoleReporter = new ConsoleReporter(scala.Console.in, new PrintWriter(_consoleBuf)):
override protected def renderPath(file: AbstractFile): String = TestReporter.renderPath(file)

final def consoleOutput: String = _consoleBuf.toString
Expand Down Expand Up @@ -123,7 +123,7 @@ object TestReporter {

def logPath: String = {
initLog()
outFile.getCanonicalPath
outFile.getCanonicalPath.nn
}

def reporter(ps: PrintStream, logLevel: Int): TestReporter =
Expand Down Expand Up @@ -160,7 +160,7 @@ object TestReporter {
Properties.rerunFailed &&
failedTestsFile.exists() &&
failedTestsFile.isFile
)(readAllLines(failedTestsFile.toPath).asScala.toList)
)(readAllLines(failedTestsFile.toPath).nn.asScala.toList)

def writeFailedTests(tests: List[String]): Unit =
initLog()
Expand All @@ -169,7 +169,7 @@ object TestReporter {

def renderPath(file: AbstractFile): String =
if JFile.separatorChar == '\\' then
file.path.replace('\\', '/')
file.path.replace('\\', '/').nn
else
file.path
}
4 changes: 2 additions & 2 deletions compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ class VulpixUnitTests:
compileFile("tests/vulpix-tests/unit/deadlock.scala", defaultOptions).expectFailure.checkRuns()

@test def badJava: Unit =
assertThrows[AssertionError](_.getMessage.contains("java compilation failed")):
assertThrows[AssertionError](_.getMessage.nn.contains("java compilation failed")):
compileFile("tests/vulpix-tests/unit/BadJava.java", defaultOptions)
.suppressAllOutput
.checkCompile()

@test def runTimeout: Unit =
val fileName = s"tests/vulpix-tests/unit/timeout.scala"
val expect = """(?m).*test '.+' timed out.*"""
assertThrows[AssertionError](_.getMessage.linesIterator.toList.last.matches(expect)):
assertThrows[AssertionError](_.getMessage.nn.linesIterator.toList.last.matches(expect)):
compileFile(fileName, defaultOptions)
.suppressAllOutput
.checkRuns()
Expand Down
33 changes: 33 additions & 0 deletions tests/pos/i16004.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

import scala.concurrent.duration.FiniteDuration
import scala.concurrent.duration._

trait Resource[F[_], A]
trait IO[A]

trait Cache[F[_], K, V]

object Cache {

final case class Config(expireAfterRead: FiniteDuration)

def expiring[F[_], K, V](
expireAfter: FiniteDuration
): Resource[F, Cache[F, K, V]] = ???

def expiring[F[_], K, V](
config: Config,
partitions: Option[Int] = None
): Resource[F, Cache[F, K, V]] = ???

/* Without partitions being specified, error is yielded */

val notCompiling = expiring[IO, Int, Int](
config = Config(expireAfterRead = 1.minute)
)

val compiling = expiring[IO, Int, Int](
config = Config(expireAfterRead = 1.minute),
partitions = None
)
}