Fixed stability problem with build.

4 files changed, 4 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
index 9b4315f493..db69e4cb42 100644
--- a/src/compiler/scala/tools/nsc/interactive/Global.scala
+++ b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -455,7 +455,6 @@ self =>
         addTypeMember(sym, vpre, false, view.tree.symbol)
       }
     }
-    //util.trace("typeMembers =")(
     members.valuesIterator.toList
   }
 
diff --git a/src/compiler/scala/tools/nsc/interpreter/ReflectionCompletion.scala b/src/compiler/scala/tools/nsc/interpreter/ReflectionCompletion.scala
index e65635dc1d..9fe427addf 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ReflectionCompletion.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ReflectionCompletion.scala
@@ -42,7 +42,7 @@ class StaticCompletion(jarEntryName: String) extends CompletionAware {
   def isScalaClazz(cl: Class[_]) = allInterfaces(cl) exists (_.getName == "scala.ScalaObject")
   def isJava = !isScalaClazz(clazz)
 
-  lazy val clazz = {
+  lazy val clazz: Class[_] = {
     val cl = Class.forName(className)
     if (className.last != '$' && isScalaClazz(cl)) {
       try Class.forName(className + "$")
diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index aa2ab5e572..f1755ed841 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -8,7 +8,7 @@ package scala.tools.nsc
 package symtab
 
 import scala.collection.immutable
-import scala.collection.mutable.{ListBuffer, HashMap, WeakHashMap}
+import scala.collection.mutable.{ListBuffer, WeakHashMap}
 import ast.TreeGen
 import util.{HashSet, Position, NoPosition}
 import util.Statistics._
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
index fd4c7ab99f..290f778827 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
@@ -1044,6 +1044,7 @@ abstract class Pickler extends SubComponent {
           print("POLYtpe "); printRef(restpe); printRefs(tparams);
         case ExistentialType(tparams, restpe) =>
           print("EXISTENTIALtpe "); printRef(restpe); printRefs(tparams);
+          print("||| "+entry)
         case DeBruijnIndex(l, i) =>
           print("DEBRUIJNINDEXtpe "); print(l+" "+i)
         case c @ Constant(_) =>
@@ -1099,7 +1100,7 @@ abstract class Pickler extends SubComponent {
         println("Pickled info for "+rootName+" V"+MajorVersion+"."+MinorVersion)
       }
       for (i <- 0 until ep) {
-        if (showSig) {
+        if (showSig/* || rootName.toString == "StaticCompletion"*/) {
           print((i formatted "%3d: ")+(writeIndex formatted "%5d: "))
           printEntry(entries(i))
         }