SI-8262 Fix compilation with 2.11 due to shadowing of Range

We now have `global.Range`, so our wildcard import of `global._` shadows `scala.Range`. This commit fully qualifies that type so as to be compatible with Scala 2.10 and 2.11.
sbt · Mar 21, 2014 · 0e3f011 · 0e3f011
1 parent 57de1fa
commit 0e3f011
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/main/actions/src/main/scala/sbt/compiler/Eval.scala b/main/actions/src/main/scala/sbt/compiler/Eval.scala
@@ -87,7 +87,7 @@ final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Se
 		val value = (cl: ClassLoader) => getValue[Any](i.enclosingModule, i.loader(cl))
 		new EvalResult(i.extra, value, i.generated, i.enclosingModule)
 	}
-	def evalDefinitions(definitions: Seq[(String,Range)], imports: EvalImports, srcName: String, valTypes: Seq[String]): EvalDefinitions =
+	def evalDefinitions(definitions: Seq[(String,scala.Range)], imports: EvalImports, srcName: String, valTypes: Seq[String]): EvalDefinitions =
 	{
 		require(definitions.nonEmpty, "Definitions to evaluate cannot be empty.")
 		val ev = new EvalType[Seq[String]] {
@@ -349,7 +349,7 @@ final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Se
 	}
 	/** Constructs a CompilationUnit for each definition, which can be used to independently parse the definition into a Tree.
 	* Additionally, a CompilationUnit for the combined definitions is constructed for use by combined compilation after parsing. */
-	private[this] def mkDefsUnit(srcName: String, definitions: Seq[(String,Range)]): (CompilationUnit, Seq[CompilationUnit]) =
+	private[this] def mkDefsUnit(srcName: String, definitions: Seq[(String,scala.Range)]): (CompilationUnit, Seq[CompilationUnit]) =
 	{
 		def fragmentUnit(content: String, lineMap: Array[Int]) = new CompilationUnit(fragmentSourceFile(srcName, content, lineMap))