diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-09 19:30:30 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-09 19:41:08 -0800 |
| commit | 747f6a8d24c628d05ab3acea0b95a82d04a71df3 (patch) | |
| tree | 435f44dd8856c91e1ac4ba1da86d74178e0a3586 /test/files/run/t6288.check | |
| parent | ce32c1af462de7d7c6b90efd56217e202a18d1e6 (diff) | |
| parent | 81d8f9d3da656cfb05f125ba7cf70ca51a477240 (diff) | |
| download | scala-747f6a8d24c628d05ab3acea0b95a82d04a71df3.tar.gz scala-747f6a8d24c628d05ab3acea0b95a82d04a71df3.tar.bz2 scala-747f6a8d24c628d05ab3acea0b95a82d04a71df3.zip | |
Merge commit '81d8f9d3da' into merge-210
* excluded from merge:
[nomerge] SI-6667 Demote a new ambiguity error to a lint warning.
Revert "SI-6422: add missing Fractional and Integral alias in scala package"
[backport] SI-6482, lost bounds in extension methods.
* commit '81d8f9d3da': (31 commits)
reflecting @throws defined in Scala code
pullrequest feedback
SI-5833 Fixes tail-of-Nil problem in RefinedType#normalizeImpl
SI-6017 Scaladoc: Show all letters without dangling links
SI-6017 Generate Scaladoc's index links in Scala side
SI-5313 Minor code cleanup for store clobbering
SI-5313 Test clobbers on the back edge of a loop
SI-7033 Be symful when creating factory methods.
SI-7022 Additional test case for value class w. bounds
SI-7039 unapplySeq result type independent of subpattern count
evicts javac-artifacts.jar
SI-7008 @throws annotations are now populated in reflect
Fix SI-6578. Deprecated `askType` because of possible race conditions in type checker.
SI-7029 - Make test more robust
SI-7029 - Makes sure that uncaught exceptions are propagated to the UEH for the global ExecutionContext
SI-6941 tests
SI-6686 drop valdef unused in flatMapCond's block
...
Conflicts:
src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala
src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
src/reflect/scala/reflect/internal/Definitions.scala
Diffstat (limited to 'test/files/run/t6288.check')
| -rw-r--r-- | test/files/run/t6288.check | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/test/files/run/t6288.check b/test/files/run/t6288.check index 0a8ff0b92d..4465b6302c 100644 --- a/test/files/run/t6288.check +++ b/test/files/run/t6288.check @@ -11,10 +11,7 @@ [64]case5()[84]{ [84]<synthetic> val o7: [84]Option[Int] = [84][84]Case3.unapply([84]x1); [84]if ([84]o7.isEmpty.unary_!) - [84]{ - [90]val nr: [90]Int = [90]o7.get; - [97][97]matchEnd4([97]()) - } + [97][97]matchEnd4([97]()) else [84][84]case6() }; @@ -38,10 +35,7 @@ [195]<synthetic> val o7: [195]Option[List[Int]] = [195][195]Case4.unapplySeq([195]x1); [195]if ([195]o7.isEmpty.unary_!) [195]if ([195][195][195][195]o7.get.!=([195]null).&&([195][195][195][195]o7.get.lengthCompare([195]1).==([195]0))) - [195]{ - [201]val nr: [201]Int = [201][201]o7.get.apply([201]0); - [208][208]matchEnd4([208]()) - } + [208][208]matchEnd4([208]()) else [195][195]case6() else |