From b68498d013fd5de33758921318f23e9351d58b59 Mon Sep 17 00:00:00 2001 From: jvican Date: Thu, 27 Apr 2017 21:22:33 +0200 Subject: [PATCH] Remove unused arguments in clean and use site `cleanCachedResolutionCache` and `clean` were doing extra work because `clean` does only need to clean the cache in the configuration (that is a class parameter). --- .../scala/sbt/internal/librarymanagement/Ivy.scala | 13 ++++--------- .../ivyint/CachedResolutionResolveEngine.scala | 5 ++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala index b5084ffb6..d0218ad9e 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala @@ -159,15 +159,10 @@ final class IvySbt(val configuration: IvyConfiguration) { self => * * @param md - module descriptor of the original Ivy graph. */ - private[sbt] def cleanCachedResolutionCache(md: ModuleDescriptor, log: Logger): Unit = - withIvy(log) { i => - val prOpt = Option(i.getSettings.getResolver(ProjectResolver.InterProject)) map { - case pr: ProjectResolver => pr - } - if (configuration.updateOptions.cachedResolution) { - IvySbt.cachedResolutionResolveCache.clean(md, prOpt) - } - } + private[sbt] def cleanCachedResolutionCache(md: ModuleDescriptor, log: Logger): Unit = { + if (!configuration.updateOptions.cachedResolution) () + else IvySbt.cachedResolutionResolveCache.clean() + } final class Module(rawModuleSettings: ModuleSettings) { val moduleSettings: ModuleSettings = IvySbt.substituteCross(rawModuleSettings) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala index 0b4e2b92a..cfb2cc755 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala @@ -64,9 +64,8 @@ private[sbt] class CachedResolutionResolveCache { val maxConflictCacheSize: Int = 1024 val maxUpdateReportCacheSize: Int = 1024 - def clean(md0: ModuleDescriptor, prOpt: Option[ProjectResolver]): Unit = { - updateReportCache.clear - } + def clean(): Unit = updateReportCache.clear + def directDependencies(md0: ModuleDescriptor): Vector[DependencyDescriptor] = md0.getDependencies.toVector // Returns a vector of (module descriptor, changing, dd)