summaryrefslogtreecommitdiff
path: root/test/files/neg/macro-invalidshape-d.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-20 14:07:01 -0700
committerPaul Phillips <paulp@improving.org>2012-09-20 14:07:01 -0700
commitcc6f5f97f8a4290391a69ac96f134cb3e8ed4381 (patch)
treef2aa4f428719b7a8c8afd9959161f43b26a2c06d /test/files/neg/macro-invalidshape-d.check
parentc8e6f8e64c4d9967cee41486cc2e324da0262976 (diff)
parent08de8afde6c99fb1739eb9730e6fce4eef54f296 (diff)
downloadscala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.tar.gz
scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.tar.bz2
scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.zip
Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.x
Diffstat (limited to 'test/files/neg/macro-invalidshape-d.check')
-rw-r--r--test/files/neg/macro-invalidshape-d.check16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/files/neg/macro-invalidshape-d.check b/test/files/neg/macro-invalidshape-d.check
index f0d77e2f2d..e43a2ca0ab 100644
--- a/test/files/neg/macro-invalidshape-d.check
+++ b/test/files/neg/macro-invalidshape-d.check
@@ -1,8 +1,8 @@
-Macros_Test_2.scala:2: warning: macro is now a reserved word; usage as an identifier is deprecated
- def foo(x: Any) = {2; macro Impls.foo}
- ^
-Macros_Test_2.scala:2: error: ';' expected but '.' found.
- def foo(x: Any) = {2; macro Impls.foo}
- ^
-one warning found
-one error found
+Macros_Test_2.scala:2: warning: macro is now a reserved word; usage as an identifier is deprecated
+ def foo(x: Any) = {2; macro Impls.foo}
+ ^
+Macros_Test_2.scala:2: error: ';' expected but '.' found.
+ def foo(x: Any) = {2; macro Impls.foo}
+ ^
+one warning found
+one error found