From d76868fc01d27ce44e6e7c925ca20088a5c14e8a Mon Sep 17 00:00:00 2001
From: Antonio Cunei <antonio.cunei@epfl.ch>
Date: Fri, 7 May 2010 13:34:27 +0000
Subject: Merged revisions 21845,21847 via svnmerge from

https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r21845 | moors | 2010-05-07 11:28:25 +0200 (Fri, 07 May 2010) | 1 line

  docs for breakout and no-arg apply in canbuildfrom ........ r21847 |
plocinic | 2010-05-07 12:38:47 +0200 (Fri, 07 May 2010) | 1 line

  Fixed partest for windows nightly. No review.
........
---
 src/library/scala/collection/generic/CanBuildFrom.scala | 4 +++-
 src/library/scala/collection/package.scala              | 4 +++-
 src/partest/scala/tools/partest/nest/Worker.scala       | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/library/scala/collection/generic/CanBuildFrom.scala b/src/library/scala/collection/generic/CanBuildFrom.scala
index 9bc5914168..4136b88cf5 100644
--- a/src/library/scala/collection/generic/CanBuildFrom.scala
+++ b/src/library/scala/collection/generic/CanBuildFrom.scala
@@ -37,8 +37,10 @@ trait CanBuildFrom[-From, -Elem, +To] {
    */
   def apply(from: From): Builder[Elem, To]
 
-  /** Creates a new builder from scratch
+  /** Creates a new builder from scratch.
+   *
    *  @return a builder for collections of type `To` with element type `Elem`.
+   *  @see scala.collection.breakOut
    */
   def apply(): Builder[Elem, To]
 }
diff --git a/src/library/scala/collection/package.scala b/src/library/scala/collection/package.scala
index d5161a0f1a..bcd2fb5d38 100644
--- a/src/library/scala/collection/package.scala
+++ b/src/library/scala/collection/package.scala
@@ -3,8 +3,10 @@ package scala
 package object collection {
   import scala.collection.generic.CanBuildFrom // can't refer to CanBuild here
 
+  /** Provides a CanBuildFrom instance that builds a specific target collection (`To') irrespective of the original collection (`From').
+   */
   def breakOut[From, T, To](implicit b : CanBuildFrom[Nothing, T, To]) =
-    new CanBuildFrom[From, T, To] {
+    new CanBuildFrom[From, T, To] { // TODO: could we just return b instead?
       def apply(from: From) = b.apply() ; def apply() = b.apply()
     }
 }
\ No newline at end of file
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 2f81dfd0f7..45fa5e2020 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -614,8 +614,8 @@ class Worker(val fileManager: FileManager) extends Actor {
                 loop()
                 testReader.close()
               }
-
-              fileManager.mapFile(logFile, "tmp", file, _.replace(sourcepath, ""))
+              val unixsrcpath = sourcepath.replaceAll(java.util.regex.Matcher.quoteReplacement("\\"), "/")
+              fileManager.mapFile(logFile, "tmp", file, _.replace(unixsrcpath, ""))
 
               diffCheck(compareOutput(file, fileBase, kind, logFile))
             }
-- 
cgit v1.2.3