From 9049773eab2dd7675a9b1cacd92bbe67825cf1ea Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sun, 19 Mar 2017 19:42:19 -0400 Subject: explicitly convert to Vector everywhere for hopefully performance benefits --- stage1/MavenRepository.scala | 4 ++-- stage1/Stage1Lib.scala | 2 +- stage1/cbt.scala | 10 +++++----- stage1/resolver.scala | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'stage1') diff --git a/stage1/MavenRepository.scala b/stage1/MavenRepository.scala index 6be537b..9ada1fd 100644 --- a/stage1/MavenRepository.scala +++ b/stage1/MavenRepository.scala @@ -7,7 +7,7 @@ case class MavenResolver( implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache ){ def bind( dependencies: MavenDependency* ): Seq[BoundMavenDependency] - = dependencies.map( BoundMavenDependency(cbtLastModified,mavenCache,_,urls.to) ).to + = dependencies.map( BoundMavenDependency(cbtLastModified,mavenCache,_,urls.toVector) ).toVector def bindOne( dependency: MavenDependency ): BoundMavenDependency - = BoundMavenDependency( cbtLastModified, mavenCache, dependency, urls.to ) + = BoundMavenDependency( cbtLastModified, mavenCache, dependency, urls.toVector ) } diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index 8aaa6e6..9e6f6b0 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -375,7 +375,7 @@ ${sourceFiles.sorted.mkString(" \\\n")} def classLoaderRecursion( dependency: Dependency, latest: Map[(String,String),Dependency])(implicit transientCache: java.util.Map[AnyRef,AnyRef], cache: ClassLoaderCache): ClassLoader = { // FIXME: shouldn't we be using KeyLockedLazyCache instead of hashmap directly here? - val dependencies = dependency.dependencies + val dependencies = dependency.dependencies.toVector val dependencyClassLoader: ClassLoader = { if( dependency.dependencies.isEmpty ){ NailgunLauncher.jdkClassLoader diff --git a/stage1/cbt.scala b/stage1/cbt.scala index 64257c2..52cebe7 100644 --- a/stage1/cbt.scala +++ b/stage1/cbt.scala @@ -61,10 +61,10 @@ object `package`{ implicit class DependencyExtensions(subject: Dependency){ import subject._ def dependencyClasspath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache): ClassPath - = Dependencies(dependenciesArray.to).classpath - def exportedClasspath: ClassPath = ClassPath(exportedClasspathArray.to) + = Dependencies(dependenciesArray.toVector).classpath + def exportedClasspath: ClassPath = ClassPath(exportedClasspathArray.toVector) def classpath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache) = exportedClasspath ++ dependencyClasspath - def dependencies: Seq[Dependency] = dependenciesArray.to + def dependencies: Seq[Dependency] = dependenciesArray.toVector } implicit class ContextExtensions(subject: Context){ import subject._ @@ -78,8 +78,8 @@ object `package`{ } val cbtDependency = cbtDependencies.stage2Dependency - def args: Seq[String] = argsArray.to - def enabledLoggers: Set[String] = enabledLoggersArray.to + def args: Seq[String] = argsArray.toVector + def enabledLoggers: Set[String] = enabledLoggersArray.toSet def scalaVersion = Option(scalaVersionOrNull) def parentBuild = Option(parentBuildOrNull) def cbtLastModified: scala.Long = subject.cbtLastModified diff --git a/stage1/resolver.scala b/stage1/resolver.scala index 0f0acaa..57ac5b6 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -365,7 +365,7 @@ case class BoundMavenDependency( } ).map( BoundMavenDependency( cbtLastModified, mavenCache, _, repositories, replace ) - ).to + ).toVector } def lookup( xml: Node, accessor: Node => NodeSeq ): Option[String] = { // println("lookup in " + xml) -- cgit v1.2.3