diff options
| author | Paul Phillips <paulp@improving.org> | 2013-05-18 10:32:06 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-18 10:56:57 -0700 |
| commit | 2b5e60e8b357b93664706e14437ae954315263e0 (patch) | |
| tree | bf11f0a7d330d44c73dd18b5f816d4b86647c19a /test | |
| parent | 01dec25425cefb6acc147d8341893eb70ca76245 (diff) | |
| parent | d93826f278b2ee8be3c4092bf800c2156d35d692 (diff) | |
| download | scala-2b5e60e8b357b93664706e14437ae954315263e0.tar.gz scala-2b5e60e8b357b93664706e14437ae954315263e0.tar.bz2 scala-2b5e60e8b357b93664706e14437ae954315263e0.zip | |
Merge commit 'd93826f278' into pr/enter-elimination-mode
* commit 'd93826f278':
Incorporated reviewer feedback.
Incorporated reviewer feedback.
Refactored stabilize.
Eliminated HKmode.
Eliminated RETmode.
Eliminated SNDTRYmode.
Started eliminating modes.
Corralling Modes into a smaller pen.
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Macros.scala
src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/run/analyzerPlugins.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/analyzerPlugins.check b/test/files/run/analyzerPlugins.check index 641fbfff6b..e3ab554d4c 100644 --- a/test/files/run/analyzerPlugins.check +++ b/test/files/run/analyzerPlugins.check @@ -7,7 +7,7 @@ annotationsConform(Int @testAnn, Int) [2] annotationsConform(Int(1) @testAnn, Int) [1] annotationsConform(Int(1), Int @testAnn) [1] annotationsConform(Nothing, Int @testAnn) [2] -annotationsConform(String @testAnn, String) [1] +annotationsConform(String @testAnn, String) [2] canAdaptAnnotations(Trees$Ident, String) [1] canAdaptAnnotations(Trees$Select, ?) [1] canAdaptAnnotations(Trees$Select, Boolean @testAnn) [1] |