diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-09-30 08:09:01 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-09-30 08:09:01 +0200 |
| commit | c0ceffb865ff4b2146aacec547cc42bb7605ee93 (patch) | |
| tree | a9deedeb96ec09780de1870e1cfd7ed13e5e6e8c /test/files/neg/macro-invalidret.check | |
| parent | 344151f17b04bf75d6ebafec6aa4229dfe6cbf09 (diff) | |
| parent | a026fd5e08d32d25e44add76384f823d35183c4f (diff) | |
| download | scala-c0ceffb865ff4b2146aacec547cc42bb7605ee93.tar.gz scala-c0ceffb865ff4b2146aacec547cc42bb7605ee93.tar.bz2 scala-c0ceffb865ff4b2146aacec547cc42bb7605ee93.zip | |
Merge pull request #4012 from retronym/merge/2.11.x-to-2.12.x-20140930
Merge 2.11.x to 2.12.x
Diffstat (limited to 'test/files/neg/macro-invalidret.check')
| -rw-r--r-- | test/files/neg/macro-invalidret.check | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/files/neg/macro-invalidret.check b/test/files/neg/macro-invalidret.check index 568cc7c570..ebdc8ec7da 100644 --- a/test/files/neg/macro-invalidret.check +++ b/test/files/neg/macro-invalidret.check @@ -19,8 +19,7 @@ Macros_Test_2.scala:7: warning: macro defs must have explicitly specified return def foo6 = macro Impls.foo6 ^ Macros_Test_2.scala:14: error: exception during macro expansion: -scala.NotImplementedError: an implementation is missing - at scala.Predef$.$qmark$qmark$qmark(Predef.scala:225) +java.lang.NullPointerException at Impls$.foo3(Impls_1.scala:7) foo3 |