From fbbbb2294680c0f57506f885971b148cae53c92d Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Fri, 10 Aug 2012 07:29:31 -0700 Subject: Made -Xfatal-warnings less immediately fatal. Instead of changing warnings to errors mid-stream, at the end of a run I check for condition "no errors, some warnings, and fatal warnings" and then generate an error at that point. This is necessary to test for some warnings which come from later stages. --- src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/compiler/scala/tools/nsc/reporters') diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala index 491718bc0d..fdf82ece71 100644 --- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala @@ -29,11 +29,7 @@ abstract class AbstractReporter extends Reporter { private def noWarnings = settings.nowarnings.value private def isPromptSet = settings.prompt.value - protected def info0(pos: Position, msg: String, _severity: Severity, force: Boolean) { - val severity = - if (settings.fatalWarnings.value && _severity == WARNING) ERROR - else _severity - + protected def info0(pos: Position, msg: String, severity: Severity, force: Boolean) { if (severity == INFO) { if (isVerbose || force) { severity.count += 1 -- cgit v1.2.3