diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-28 18:41:11 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-28 18:41:11 +1000 |
commit | 5508e00a552d81ce483bd69084eea087fb178647 (patch) | |
tree | de25d3140e0f33e84d66321221eecf5525a0d5d7 /test | |
parent | f62c312a857e1a6cc6646ee60a0f86866e19c01b (diff) | |
parent | dc548947a32f7923fdb5ed4f0a9c8454773b1a05 (diff) | |
download | scala-5508e00a552d81ce483bd69084eea087fb178647.tar.gz scala-5508e00a552d81ce483bd69084eea087fb178647.tar.bz2 scala-5508e00a552d81ce483bd69084eea087fb178647.zip |
Merge pull request #4006 from retronym/topic/defragility
Avoid test fragility to changes in Predef
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/macro-invalidret.check | 3 | ||||
-rw-r--r-- | test/files/neg/macro-invalidret/Impls_1.scala | 2 |
2 files changed, 2 insertions, 3 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 diff --git a/test/files/neg/macro-invalidret/Impls_1.scala b/test/files/neg/macro-invalidret/Impls_1.scala index 434aeef10f..a52e8d8f39 100644 --- a/test/files/neg/macro-invalidret/Impls_1.scala +++ b/test/files/neg/macro-invalidret/Impls_1.scala @@ -4,7 +4,7 @@ import scala.reflect.runtime.{universe => ru} object Impls { def foo1(c: Context) = 2 def foo2(c: Context) = ru.Literal(ru.Constant(42)) - def foo3(c: Context) = ??? + def foo3(c: Context) = throw null def foo5(c: Context) = c.universe.Literal(c.universe.Constant(42)) def foo6(c: Context) = c.Expr[Int](c.universe.Literal(c.universe.Constant(42))) } |