summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-03-31 14:39:00 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-03-31 14:39:00 -0700
commit32f520f3ed78ecde390dc7b1b48d3130e412a9dc (patch)
treee2e3d9c705d7bb84272a7ae5e6188321bfbb6422 /src/compiler
parent8108ed6b4efe4d82cfe949205607c2a1167f312b (diff)
parentbf6398820971fb0133c53a86e6835ee0f549c35b (diff)
downloadscala-32f520f3ed78ecde390dc7b1b48d3130e412a9dc.tar.gz
scala-32f520f3ed78ecde390dc7b1b48d3130e412a9dc.tar.bz2
scala-32f520f3ed78ecde390dc7b1b48d3130e412a9dc.zip
Merge pull request #4418 from lrytz/t8731-relax
SI-8731 don't issue a @switch warning for two-case matches
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala b/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala
index b703b5bc6d..e1fe220556 100644
--- a/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala
+++ b/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala
@@ -577,8 +577,6 @@ trait MatchTreeMaking extends MatchCodeGen with Debugging {
lengthMax3(casesNoSubstOnly) > 2
}
val requireSwitch = hasSwitchAnnotation && exceedsTwoCasesOrAlts
- if (hasSwitchAnnotation && !requireSwitch)
- reporter.warning(scrut.pos, "matches with two cases or fewer are emitted using if-then-else instead of switch")
(suppression, requireSwitch)
case _ =>
(Suppression.NoSuppression, false)