From 623fc52d37dc8c171d1fa2a0bb346265054c4b40 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sun, 26 Feb 2017 21:39:12 +0800 Subject: make listRecursive a File extension method for brevity --- stage2/Lib.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stage2') diff --git a/stage2/Lib.scala b/stage2/Lib.scala index b6187ce..d6c827f 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -283,7 +283,7 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger){ def sourceFiles( sources: Seq[File], sourceFileFilter: File => Boolean ): Seq[File] = { for { base <- sources.filter(_.exists).map(lib.realpath) - file <- lib.listFilesRecursive(base) if file.isFile && sourceFileFilter(file) + file <- base.listRecursive if file.isFile && sourceFileFilter(file) } yield file } @@ -309,7 +309,7 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger){ try{ val names = for { base <- files.filter(_.exists).map(realpath) - file <- listFilesRecursive(base) if file.isFile + file <- base.listRecursive if file.isFile } yield { val strip = Some( base ).filter(_.isDirectory) ++ stripBaseCanonical val name = strip.foldLeft( file.getCanonicalPath )( -- cgit v1.2.3