luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1241 from jaceklaskowski/follow-deprecation 

Follow deprecation
This commit is contained in:
Josh Suereth 2014-04-08 11:11:40 -04:00
parent 46598ea575 5c268bd9ea
commit 1fbf5a649a
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/io/src/main/scala/sbt/Path.scala
View File

@ -118,25 +118,21 @@ sealed abstract class PathFinder
final def \ (literal: String): PathFinder = this / literal
@deprecated("Use pair.", "0.13.1")
def x_![T](mapper: File => Option[T]): Traversable[(File,T)] = x(mapper, false)
def x_![T](mapper: File => Option[T]): Traversable[(File,T)] = pair(mapper, false)
/** Applies `mapper` to each path selected by this PathFinder and returns the path paired with the non-empty result.
* If the result is empty (None) and `errorIfNone` is true, an exception is thrown.
* If `errorIfNone` is false, the path is dropped from the returned Traversable.*/
def pair[T](mapper: File => Option[T], errorIfNone: Boolean = true): Seq[(File,T)] =
x(mapper, errorIfNone)
{
val apply = if(errorIfNone) mapper | fail else mapper
for(file <- get; mapped <- apply(file)) yield (file, mapped)
}
/** Applies `mapper` to each path selected by this PathFinder and returns the path paired with the non-empty result.
* If the result is empty (None) and `errorIfNone` is true, an exception is thrown.
* If `errorIfNone` is false, the path is dropped from the returned Traversable.*/
@deprecated("Use pair.", "0.13.1")
def x[T](mapper: File => Option[T], errorIfNone: Boolean = true): Seq[(File,T)] =
{
val apply = if(errorIfNone) mapper | fail else mapper
for(file <- get; mapped <- apply(file)) yield (file, mapped)
}
def x[T](mapper: File => Option[T], errorIfNone: Boolean = true): Seq[(File,T)] = pair(mapper, errorIfNone)
/** Selects all descendant paths with a name that matches <code>include</code> and do not have an intermediate
/** Selects all descendant paths with a name that matches <code>include</code> and do not have an intermediate
* path with a name that matches <code>intermediateExclude</code>. Typical usage is:
*
* <code>descendantsExcept("*.jar", ".svn")</code>*/