diff options
| author | Paul Phillips <paulp@improving.org> | 2011-06-11 10:17:49 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-06-11 10:17:49 +0000 |
| commit | d73d4950c99dcd383408bfa6502bce592517825a (patch) | |
| tree | 740eb497d6b1b40bfb24b707c7a1f5ebd651f720 /src/compiler/scala/tools/nsc/Global.scala | |
| parent | c8f4316b374d78caaf5ba605cd34e323b78a77de (diff) | |
| download | scala-d73d4950c99dcd383408bfa6502bce592517825a.tar.gz scala-d73d4950c99dcd383408bfa6502bce592517825a.tar.bz2 scala-d73d4950c99dcd383408bfa6502bce592517825a.zip | |
Making some recent changes less breaky so sbt c...
Making some recent changes less breaky so sbt can be used with trunk
again. Mainly, renamed scala.reflect.internal's AbstractFile to
AbstractFileType. I can't see a way around renaming it and it's becoming
quite a problem not to have sbt. I inspected scala-ide and I don't think
this is going to break it, but in general I don't know how plausible it
is that we can avoid periodic breakage given that we have at least three
source bases (scala, sbt, scala-ide) each with multiple branches with
interdependencies which are not being continuously integrated. Review by
odersky.
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index c777652706..9405d11a02 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -52,9 +52,9 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb this(settings, new ConsoleReporter(settings)) // fulfilling requirements - - type AbstractFile = scala.tools.nsc.io.AbstractFile - val AbstractFile = scala.tools.nsc.io.AbstractFile + // Renamed AbstractFile to AbstractFileType for backward compatibility: + // it is difficult for sbt to work around the ambiguity errors which result. + type AbstractFileType = scala.tools.nsc.io.AbstractFile def mkAttributedQualifier(tpe: Type, termSym: Symbol): Tree = gen.mkAttributedQualifier(tpe, termSym) |