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

Merge pull request #1346 from benjyw/sort_analysis_seqs 

Ensure sequences in analysis files are read in order.
This commit is contained in:
Josh Suereth 2014-05-19 10:45:13 -04:00
parent da9f29bd04 00f12c6046
commit 398385d00c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile/persist/src/main/scala/sbt/inc/TextAnalysisFormat.scala
View File

@ -436,7 +436,7 @@ object TextAnalysisFormat {
} }
private[this] def readSeq[T](in: BufferedReader)(expectedHeader: String, s2t: String => T): Seq[T] = private[this] def readSeq[T](in: BufferedReader)(expectedHeader: String, s2t: String => T): Seq[T] =
(readPairs(in)(expectedHeader, identity[String], s2t) map (_._2)).toSeq (readPairs(in)(expectedHeader, identity[String], s2t).toSeq.sortBy(_._1) map (_._2))
private[this] def writeMap[K, V](out: Writer)(header: String, m: Map[K, V], v2s: V => String, inlineVals: Boolean = true)(implicit ord: Ordering[K]) { private[this] def writeMap[K, V](out: Writer)(header: String, m: Map[K, V], v2s: V => String, inlineVals: Boolean = true)(implicit ord: Ordering[K]) {
writeHeader(out, header) writeHeader(out, header)