fix deprecation warnings in Eval under Scala 2.11.8

1 files changed, 3 insertions, 5 deletions

diff --git a/libraries/eval/Eval.scala b/libraries/eval/Eval.scala
index ff87651..6a58491 100644
--- a/libraries/eval/Eval.scala
+++ b/libraries/eval/Eval.scala
@@ -24,8 +24,7 @@ import java.util.Random
 import java.util.jar.JarFile
 import scala.collection.mutable
 import scala.io.Source
-import scala.reflect.internal.util.{BatchSourceFile, Position}
-import scala.tools.nsc.interpreter.AbstractFileClassLoader
+import scala.reflect.internal.util.{BatchSourceFile, Position, AbstractFileClassLoader}
 import scala.tools.nsc.io.{AbstractFile, VirtualDirectory}
 import scala.tools.nsc.reporters.{Reporter, AbstractReporter}
 import scala.tools.nsc.{Global, Settings}
@@ -35,8 +34,7 @@ import scala.util.matching.Regex
 /**
  * Evaluate a file or string and return the result.
  */
-@deprecated("use a throw-away instance of Eval instead", "1.8.1")
-object Eval extends Eval {
+object Eval {
   private val jvmId = java.lang.Math.abs(new Random().nextInt())
   val classCleaner: Regex = "\\W".r
 }
@@ -506,7 +504,7 @@ class Eval(target: Option[File]) {
           }
         messages += (severityName + lineMessage + ": " + message) ::
           (if (pos.isDefined) {
-            pos.inUltimateSource(pos.source).lineContent.stripLineEnd ::
+            pos.finalPosition.lineContent.stripLineEnd ::
               (" " * (pos.column - 1) + "^") ::
               Nil
           } else {