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

Fix equals for FileCacheEntry 

The equals method didn't work exactly the way I thought. By delegating
to the equivStamp object in sbt we can be more confident that it is
actually comparing the stamp values and not object references or
some other equals implementation.
This commit is contained in:
Ethan Atkins 2019-02-07 17:03:41 -08:00
parent 47b85b98c0
commit 1489879b80
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main-command/src/main/scala/sbt/internal/FileCacheEntry.scala
View File

@ -36,6 +36,9 @@ object FileCacheEntry {
}
}
private implicit class Equiv(val xstamp: XStamp) extends AnyVal {
def equiv(that: XStamp): Boolean = Stamp.equivStamp.equiv(xstamp, that)
}
private case class DelegateFileCacheEntry(private val stamp: XStamp)
extends FileCacheEntry
with XStamp {
@ -52,9 +55,9 @@ object FileCacheEntry {
case _ => None
}
override def equals(o: Any): Boolean = o match {
case that: DelegateFileCacheEntry => this.stamp == that.stamp
case that: XStamp => this.stamp == that
case _ => false
case DelegateFileCacheEntry(thatStamp) => this.stamp equiv thatStamp
case xStamp: XStamp => this.stamp equiv xStamp
case _ => false
}
override def hashCode: Int = stamp.hashCode
override def toString: String = s"FileCacheEntry(hash = $hash, lastModified = $lastModified)"