Make caches in 'ExtractAPI' use 'perRunCaches' #324

sbt · Jul 7, 2017 · 9c5c75f · 9c5c75f
1 parent eda9d95
commit 9c5c75f
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala b/internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala
@@ -62,16 +62,16 @@ class ExtractAPI[GlobalType <: Global](
   // this cache reduces duplicate work both here and when persisting
   //   caches on other structures had minimal effect on time and cache size
   //   (tried: Definition, Modifier, Path, Id, String)
-  private[this] val typeCache = new HashMap[(Symbol, Type), xsbti.api.Type]
+  private[this] val typeCache = perRunCaches.newMap[(Symbol, Type), xsbti.api.Type]()
   // these caches are necessary for correctness
-  private[this] val structureCache = new HashMap[Symbol, xsbti.api.Structure]
-  private[this] val classLikeCache = new HashMap[(Symbol, Symbol), xsbti.api.ClassLikeDef]
-  private[this] val pending = new HashSet[xsbti.api.Lazy[_]]
+  private[this] val structureCache = perRunCaches.newMap[Symbol, xsbti.api.Structure]()
+  private[this] val classLikeCache = perRunCaches.newMap[(Symbol, Symbol), xsbti.api.ClassLikeDef]()
+  private[this] val pending = perRunCaches.newSet[xsbti.api.Lazy[_]]()
 
-  private[this] val emptyStringArray = new Array[String](0)
+  private[this] val emptyStringArray = Array.empty[String]
 
-  private[this] val allNonLocalClassesInSrc = new HashSet[xsbti.api.ClassLike]
-  private[this] val _mainClasses = new HashSet[String]
+  private[this] val allNonLocalClassesInSrc = perRunCaches.newSet[xsbti.api.ClassLike]()
+  private[this] val _mainClasses = perRunCaches.newSet[String]()
 
   /**
    * Implements a work-around for https://github.com/sbt/sbt/issues/823