File tree Expand file tree Collapse file tree 2 files changed +8
-1
lines changed
src/dotty/tools/dotc/reporting Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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) +
You can’t perform that action at this time.
0 commit comments