summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-16 11:36:51 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-09-16 11:36:51 +1000
commit2724a1ce206eee03d984472b19ac908fc62e9ccc (patch)
treeba39a0e0ba6d6d896e898526316d567ea080ff5f /test/files/neg
parentc154d343348218d1008e4217713246c3e23acd1d (diff)
parentabd595db299024b76f75da0728ae7ec4fca4bcae (diff)
downloadscala-2724a1ce206eee03d984472b19ac908fc62e9ccc.tar.gz
scala-2724a1ce206eee03d984472b19ac908fc62e9ccc.tar.bz2
scala-2724a1ce206eee03d984472b19ac908fc62e9ccc.zip
Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/compile-time-only-a.check5
1 files changed, 1 insertions, 4 deletions
diff --git a/test/files/neg/compile-time-only-a.check b/test/files/neg/compile-time-only-a.check
index 9bc96f6b9b..b1ed1d24c2 100644
--- a/test/files/neg/compile-time-only-a.check
+++ b/test/files/neg/compile-time-only-a.check
@@ -4,9 +4,6 @@ compile-time-only-a.scala:10: error: C3
compile-time-only-a.scala:12: error: C4
@compileTimeOnly("C4") case class C4(x: Int)
^
-compile-time-only-a.scala:17: error: C5
- implicit class C5(val x: Int) {
- ^
compile-time-only-a.scala:32: error: C1
new C1()
^
@@ -76,4 +73,4 @@ compile-time-only-a.scala:75: error: placebo
compile-time-only-a.scala:75: error: placebo
@placebo def x = (2: @placebo)
^
-26 errors found
+25 errors found