Revert "Commenting out unused members."

This reverts commit 951fc3a486.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/compiler/scala/tools/nsc/util/package.scala b/src/compiler/scala/tools/nsc/util/package.scala
index b40d3094f3..e9dcaa8e16 100644
--- a/src/compiler/scala/tools/nsc/util/package.scala
+++ b/src/compiler/scala/tools/nsc/util/package.scala
@@ -18,15 +18,15 @@ package object util {
   type HashSet[T >: Null <: AnyRef] = scala.reflect.internal.util.HashSet[T]
   val HashSet = scala.reflect.internal.util.HashSet
 
-  // def onull[T](value: T, orElse: => T): T = if (value == null) orElse else value
+  def onull[T](value: T, orElse: => T): T = if (value == null) orElse else value
 
   /** Apply a function and return the passed value */
   def returning[T](x: T)(f: T => Unit): T = { f(x) ; x }
 
   /** Frequency counter */
-  // def freq[T](xs: Traversable[T]): Map[T, Int] = xs groupBy identity mapValues (_.size)
+  def freq[T](xs: Traversable[T]): Map[T, Int] = xs groupBy identity mapValues (_.size)
 
-  // def freqrank[T](xs: Traversable[(T, Int)]): List[(Int, T)] = xs.toList map (_.swap) sortBy (-_._1)
+  def freqrank[T](xs: Traversable[(T, Int)]): List[(Int, T)] = xs.toList map (_.swap) sortBy (-_._1)
 
   /** Execute code and then wait for all non-daemon Threads
    *  created and begun during its execution to complete.
@@ -57,14 +57,14 @@ package object util {
   /** Given a function and a block of code, evaluates code block,
    *  calls function with milliseconds elapsed, and returns block result.
    */
-  // def millisElapsedTo[T](f: Long => Unit)(body: => T): T = {
-  //   val start = System.currentTimeMillis
-  //   val result = body
-  //   val end = System.currentTimeMillis
+  def millisElapsedTo[T](f: Long => Unit)(body: => T): T = {
+    val start = System.currentTimeMillis
+    val result = body
+    val end = System.currentTimeMillis
 
-  //   f(end - start)
-  //   result
-  // }
+    f(end - start)
+    result
+  }
 
   /** Generate a string using a routine that wants to write on a stream. */
   def stringFromWriter(writer: PrintWriter => Unit): String = {
@@ -96,7 +96,7 @@ package object util {
   }
 
   lazy val trace = new SimpleTracer(System.out)
-  // lazy val errtrace = new SimpleTracer(System.err)
+  lazy val errtrace = new SimpleTracer(System.err)
 
   @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0")
   val StringOps = scala.reflect.internal.util.StringOps