diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-20 14:07:01 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-20 14:07:01 -0700 |
| commit | cc6f5f97f8a4290391a69ac96f134cb3e8ed4381 (patch) | |
| tree | f2aa4f428719b7a8c8afd9959161f43b26a2c06d /test/files/neg/macro-override-method-overrides-macro.check | |
| parent | c8e6f8e64c4d9967cee41486cc2e324da0262976 (diff) | |
| parent | 08de8afde6c99fb1739eb9730e6fce4eef54f296 (diff) | |
| download | scala-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-override-method-overrides-macro.check')
| -rw-r--r-- | test/files/neg/macro-override-method-overrides-macro.check | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/files/neg/macro-override-method-overrides-macro.check b/test/files/neg/macro-override-method-overrides-macro.check index 42edb0ff23..66dc11be96 100644 --- a/test/files/neg/macro-override-method-overrides-macro.check +++ b/test/files/neg/macro-override-method-overrides-macro.check @@ -1,5 +1,5 @@ -Macros_Test_2.scala:8: error: overriding macro method foo in class B of type (x: String)Unit;
- method foo cannot override a macro
- override def foo(x: String) = println("fooDString")
- ^
-one error found
+Macros_Test_2.scala:8: error: overriding macro method foo in class B of type (x: String)Unit; + method foo cannot override a macro + override def foo(x: String) = println("fooDString") + ^ +one error found |