diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-11-22 03:16:13 -0800 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-11-22 03:16:13 -0800 |
| commit | 5710c58b405e107ec29283d846acafd0cda13dcf (patch) | |
| tree | 2ed4ba76fad4790664f41d08327c6689df348eaf /test/files | |
| parent | 666f39d3493ee633a616c40f1c41add1190a3a40 (diff) | |
| parent | 2d4f0f1859b957b744f9b9f222dec8e8c478a4a8 (diff) | |
| download | scala-5710c58b405e107ec29283d846acafd0cda13dcf.tar.gz scala-5710c58b405e107ec29283d846acafd0cda13dcf.tar.bz2 scala-5710c58b405e107ec29283d846acafd0cda13dcf.zip | |
Merge pull request #3152 from paulp/pr/deprecations
Removing deprecated code.
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/run/ctries-old/main.scala | 2 | ||||
| -rw-r--r-- | test/files/run/getClassTest-old.scala | 2 | ||||
| -rw-r--r-- | test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/files/run/ctries-old/main.scala b/test/files/run/ctries-old/main.scala index f714bcdcdc..77161fed2f 100644 --- a/test/files/run/ctries-old/main.scala +++ b/test/files/run/ctries-old/main.scala @@ -38,7 +38,7 @@ trait Spec { var produced = false try body catch { - case e: Throwable => if (e.getClass == implicitly[ClassManifest[T]].erasure) produced = true + case e: Throwable => if (e.getClass == implicitly[ClassManifest[T]].runtimeClass) produced = true } finally { assert(produced, "Did not produce exception of type: " + implicitly[ClassManifest[T]]) } diff --git a/test/files/run/getClassTest-old.scala b/test/files/run/getClassTest-old.scala index 789dd4d162..cd1b6b07f6 100644 --- a/test/files/run/getClassTest-old.scala +++ b/test/files/run/getClassTest-old.scala @@ -53,7 +53,7 @@ class MoreAnyRefs { @deprecated("Suppress warnings", since="2.11") object Test { def returnTypes[T: Manifest] = ( - manifest[T].erasure.getMethods.toList + manifest[T].runtimeClass.getMethods.toList filter (_.getName startsWith "f") sortBy (_.getName) map (m => m.getName + ": " + m.getGenericReturnType.toString) diff --git a/test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala b/test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala index b2bce124ee..88a677b913 100644 --- a/test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala +++ b/test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala @@ -59,7 +59,7 @@ trait Helpers { } def assertThrows[T <: AnyRef](f: => Any)(implicit manifest: Manifest[T]): Unit = { - val clazz = manifest.erasure.asInstanceOf[Class[T]] + val clazz = manifest.runtimeClass.asInstanceOf[Class[T]] val thrown = try { f |