Skip to content

Commit 717fec4

Browse files
committed
Don't issue errors under -Xfatal-warnings for disabled conditional warnings
1 parent f18b5f6 commit 717fec4

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

compiler/src/dotty/tools/dotc/reporting/Reporter.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,13 @@ trait Reporting { this: Context =>
5050

5151
def reportWarning(warning: Warning): Unit =
5252
if (!this.settings.silentWarnings.value) {
53-
if (this.settings.XfatalWarnings.value) reporter.report(warning.toError)
53+
if (this.settings.XfatalWarnings.value)
54+
warning match {
55+
case warning: ConditionalWarning if !warning.enablingOption.value =>
56+
reporter.report(warning) // conditional warnings that are not enabled are not fatal
57+
case _ =>
58+
reporter.report(warning.toError)
59+
}
5460
else reporter.report(warning)
5561
}
5662

compiler/test/dotty/tools/dotc/CompilationTests.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ class CompilationTests extends ParallelTesting {
162162
compileFile("tests/neg-custom-args/i3882.scala", allowDeepSubtypes) +
163163
compileFile("tests/neg-custom-args/i4372.scala", allowDeepSubtypes) +
164164
compileFile("tests/neg-custom-args/i1754.scala", allowDeepSubtypes) +
165+
compileFile("tests/neg-custom-args/conditionalWarnings.scala", allowDeepSubtypes.and("-deprecation").and("-Xfatal-warnings")) +
165166
compileFilesInDir("tests/neg-custom-args/isInstanceOf", allowDeepSubtypes and "-Xfatal-warnings") +
166167
compileFile("tests/neg-custom-args/i3627.scala", allowDeepSubtypes) +
167168
compileFile("tests/neg-custom-args/matchtype-loop.scala", allowDeepSubtypes) +

0 commit comments

Comments
 (0)