diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-15 14:11:51 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-15 14:11:51 -0800 |
| commit | 8782954fa4cfe965d2323d575b09eca754d357e3 (patch) | |
| tree | 65aff34aed79003b09f706139c0189a6dc1a27bd /test | |
| parent | 0f784a53bcce67c760c8c1041d0f4c632fc3e5b3 (diff) | |
| parent | 765ac94c2ba8daba265bbccfe1b44712d240922e (diff) | |
| download | scala-8782954fa4cfe965d2323d575b09eca754d357e3.tar.gz scala-8782954fa4cfe965d2323d575b09eca754d357e3.tar.bz2 scala-8782954fa4cfe965d2323d575b09eca754d357e3.zip | |
Merge pull request #3293 from soc/SI-7469
Remove misc. @deprecated elements
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/macro-invalidret.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t3403.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/macro-invalidret.check b/test/files/neg/macro-invalidret.check index 99f29e57ce..568cc7c570 100644 --- a/test/files/neg/macro-invalidret.check +++ b/test/files/neg/macro-invalidret.check @@ -20,7 +20,7 @@ Macros_Test_2.scala:7: warning: macro defs must have explicitly specified return ^ Macros_Test_2.scala:14: error: exception during macro expansion: scala.NotImplementedError: an implementation is missing - at scala.Predef$.$qmark$qmark$qmark(Predef.scala:227) + at scala.Predef$.$qmark$qmark$qmark(Predef.scala:225) at Impls$.foo3(Impls_1.scala:7) foo3 diff --git a/test/files/neg/t3403.scala b/test/files/neg/t3403.scala index 8be6ab2a31..7cf0c3e0f7 100644 --- a/test/files/neg/t3403.scala +++ b/test/files/neg/t3403.scala @@ -1,2 +1,2 @@ -import scala.reflect.{BeanProperty => bp} +import scala.beans.{BeanProperty => bp} class Foo { @bp var bar: Int = 1 } |