diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-03-31 14:39:00 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-03-31 14:39:00 -0700 |
commit | 32f520f3ed78ecde390dc7b1b48d3130e412a9dc (patch) | |
tree | e2e3d9c705d7bb84272a7ae5e6188321bfbb6422 /src | |
parent | 8108ed6b4efe4d82cfe949205607c2a1167f312b (diff) | |
parent | bf6398820971fb0133c53a86e6835ee0f549c35b (diff) | |
download | scala-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')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala | 2 | ||||
-rw-r--r-- | src/library/scala/annotation/switch.scala | 3 |
2 files changed, 3 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) diff --git a/src/library/scala/annotation/switch.scala b/src/library/scala/annotation/switch.scala index 23e3923407..00124cf88b 100644 --- a/src/library/scala/annotation/switch.scala +++ b/src/library/scala/annotation/switch.scala @@ -22,6 +22,9 @@ package scala.annotation } }}} * + * Note: for pattern matches with one or two cases, the compiler generates jump instructions. + * Annotating such a match with `@switch` does not issue any warning. + * * @author Paul Phillips * @since 2.8 */ |