Skip to content

Commit b8565a0

Browse files
committed
Fix wrong rebase
1 parent d54d8a2 commit b8565a0

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,10 @@ abstract class Reporter extends interfaces.ReporterResult {
154154
val key = w.enablingOption.name
155155
addUnreported(key, 1)
156156
case _ =>
157-
// conditional warnings that are not enabled are not fatal
158-
val d = dia match
159-
case w: Warning if ctx.settings.XfatalWarnings.value => w.toError
160-
case _ => dia
161-
if !isHidden(d) then // avoid isHidden test for summarized warnings so that message is not forced
162-
markReported(d)
163-
withMode(Mode.Printing)(doReport(d))
164-
d match {
157+
if !isHidden(dia) then // avoid isHidden test for summarized warnings so that message is not forced
158+
markReported(dia)
159+
withMode(Mode.Printing)(doReport(dia))
160+
dia match {
165161
case w: Warning =>
166162
warnings = w :: warnings
167163
_warningCount += 1

0 commit comments

Comments
 (0)