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

Simplify operations on collections

This commit is contained in:
Pierre DAL-PRA 2015-08-01 02:19:25 +02:00
parent 432aaece7b
commit 345cceafe6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/collection/src/main/scala/sbt/Settings.scala
View File

@ -296,7 +296,7 @@ trait Init[Scope] {
def definedAtString(settings: Seq[Setting[_]]): String = def definedAtString(settings: Seq[Setting[_]]): String =
{ {
val posDefined = settings.flatMap(_.positionString.toList) val posDefined = settings.flatMap(_.positionString.toList)
if (posDefined.size > 0) { if (posDefined.nonEmpty) {
val header = if (posDefined.size == settings.size) "defined at:" else val header = if (posDefined.size == settings.size) "defined at:" else
"some of the defining occurrences:" "some of the defining occurrences:"
header + (posDefined.distinct mkString ("\n\t", "\n\t", "\n")) header + (posDefined.distinct mkString ("\n\t", "\n\t", "\n"))

2
util/complete/src/main/scala/sbt/LineReader.scala
View File

@ -45,7 +45,7 @@ abstract class JLine extends LineReader {
private[this] def handleMultilinePrompt(prompt: String): String = { private[this] def handleMultilinePrompt(prompt: String): String = {
val lines = """\r?\n""".r.split(prompt) val lines = """\r?\n""".r.split(prompt)
lines.size match { lines.length match {
case 0 | 1 => prompt case 0 | 1 => prompt
case _ => reader.print(lines.init.mkString("\n") + "\n"); lines.last; case _ => reader.print(lines.init.mkString("\n") + "\n"); lines.last;
} }

2
util/log/src/main/scala/sbt/LoggerWriter.scala
View File

@ -17,7 +17,7 @@ class LoggerWriter(delegate: Logger, unbufferedLevel: Option[Level.Value], nl: S
override def close() = flush() override def close() = flush()
override def flush(): Unit = override def flush(): Unit =
synchronized { synchronized {
if (buffer.length > 0) { if (buffer.nonEmpty) {
log(buffer.toString) log(buffer.toString)
buffer.clear() buffer.clear()
} }

2
util/relation/src/main/scala/sbt/Relation.scala
View File

@ -123,7 +123,7 @@ private final class MRelation[A, B](fwd: Map[A, Set[B]], rev: Map[B, Set[A]]) ex
def _1s = fwd.keySet def _1s = fwd.keySet
def _2s = rev.keySet def _2s = rev.keySet
def size = (fwd.valuesIterator map { _.size }).foldLeft(0)(_ + _) def size = (fwd.valuesIterator map (_.size)).sum
def all: Traversable[(A, B)] = fwd.iterator.flatMap { case (a, bs) => bs.iterator.map(b => (a, b)) }.toTraversable def all: Traversable[(A, B)] = fwd.iterator.flatMap { case (a, bs) => bs.iterator.map(b => (a, b)) }.toTraversable