summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-05-20 09:25:21 -0700
committerPaul Phillips <paulp@improving.org>2013-05-20 09:25:21 -0700
commite6ac1214c6197af01850601b3e623ef75157da6a (patch)
tree47df6c1afb9641782edc207a753cc740c1e8c3f7 /test/files
parent20d9fce42c2eaa3af3eb0af2a2509a23e223ebf8 (diff)
parentc389da3f455efb95e237f56c44106d0572d2e1f3 (diff)
downloadscala-e6ac1214c6197af01850601b3e623ef75157da6a.tar.gz
scala-e6ac1214c6197af01850601b3e623ef75157da6a.tar.bz2
scala-e6ac1214c6197af01850601b3e623ef75157da6a.zip
Merge pull request #2492 from paulp/pr/enter-elimination-mode
Toward more organized typer state.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/analyzerPlugins.check2
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]