diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-09-03 08:16:36 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-09-03 08:16:36 +0200 |
| commit | 2f78ddd3d011457b9afb0078f20e3b612f1e087e (patch) | |
| tree | b55c2d783f2b80fb74218759f8c453a53b2dc09e /src | |
| parent | 816c399beb22da612721ec7a4fa781dbeeb03a46 (diff) | |
| parent | 6076d61aef732b89af9d2c803425f90fb0fc4686 (diff) | |
| download | scala-2f78ddd3d011457b9afb0078f20e3b612f1e087e.tar.gz scala-2f78ddd3d011457b9afb0078f20e3b612f1e087e.tar.bz2 scala-2f78ddd3d011457b9afb0078f20e3b612f1e087e.zip | |
Merge pull request #3955 from som-snytt/issue/8410
SI-8410 Don't warn fatally on disabled flag
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Reporting.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Reporting.scala b/src/compiler/scala/tools/nsc/Reporting.scala index b164f395fe..c9782de7c8 100644 --- a/src/compiler/scala/tools/nsc/Reporting.scala +++ b/src/compiler/scala/tools/nsc/Reporting.scala @@ -33,7 +33,7 @@ trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions w if (option) reporter.warning(pos, msg) else if (!(warnings contains pos)) warnings += ((pos, msg)) def summarize() = - if (warnings.nonEmpty && (option.isDefault || settings.fatalWarnings)) { + if (warnings.nonEmpty && (option.isDefault || option)) { val numWarnings = warnings.size val warningVerb = if (numWarnings == 1) "was" else "were" val warningCount = countElementsAsString(numWarnings, s"$what warning") @@ -105,4 +105,4 @@ trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions w reporter.error(NoPosition, "No warnings can be incurred under -Xfatal-warnings.") } } -}
\ No newline at end of file +} |