diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-22 22:27:31 +0800 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-22 22:27:31 +0800 |
commit | 698ef6c1d83215461275f9690a26178be3cae3fb (patch) | |
tree | 269d4325dfd4d4155743bd490c4999e0b3759c95 /stage1/Stage1.scala | |
parent | ee4f446e1dbef8f4983525376abf2274c01d0395 (diff) | |
download | cbt-698ef6c1d83215461275f9690a26178be3cae3fb.tar.gz cbt-698ef6c1d83215461275f9690a26178be3cae3fb.tar.bz2 cbt-698ef6c1d83215461275f9690a26178be3cae3fb.zip |
a few hopefully simplifying rewirings in the implicits
Diffstat (limited to 'stage1/Stage1.scala')
-rw-r--r-- | stage1/Stage1.scala | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala index 60f0ad9..714ed65 100644 --- a/stage1/Stage1.scala +++ b/stage1/Stage1.scala @@ -40,12 +40,11 @@ class Stage2Args( val cwd: File, val args: Seq[String], val stage2LastModified: Long, - val logger: Logger, val cache: File, val cbtHome: File, val compatibilityTarget: File )( - implicit val transientCache: java.util.Map[AnyRef,AnyRef], val classLoaderCache: ClassLoaderCache + implicit val transientCache: java.util.Map[AnyRef,AnyRef], val classLoaderCache: ClassLoaderCache, val logger: Logger ){ val persistentCache = classLoaderCache.hashMap } @@ -61,9 +60,8 @@ object Stage1{ val (cbtLastModified, classLoader) = buildStage2( buildStage1, context.cbtHome, - context.cache, - logger - )(context.transientCache, new ClassLoaderCache( context.persistentCache )) + context.cache + )(context.transientCache, new ClassLoaderCache( context.persistentCache ), logger) classLoader .loadClass("cbt.Stage2") @@ -77,8 +75,8 @@ object Stage1{ } def buildStage2( - buildStage1: BuildStage1Result, cbtHome: File, cache: File, logger: Logger - )(implicit transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache): (Long, ClassLoader) = { + buildStage1: BuildStage1Result, cbtHome: File, cache: File + )(implicit transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache, logger: Logger): (Long, ClassLoader) = { import buildStage1._ @@ -162,20 +160,19 @@ object Stage1{ persistentCache: java.util.Map[AnyRef,AnyRef] ): Int = { val args = Stage1ArgsParser(_args.toVector) - val logger = new Logger(args.enabledLoggers, buildStage1.start) + implicit val logger = new Logger(args.enabledLoggers, buildStage1.start) logger.stage1(s"Stage1 start") implicit val transientCache: java.util.Map[AnyRef,AnyRef] = new java.util.HashMap implicit val classLoaderCache = new ClassLoaderCache( persistentCache ) - val (stage2LastModified, classLoader) = buildStage2( buildStage1, cbtHome, cache, logger ) + val (stage2LastModified, classLoader) = buildStage2( buildStage1, cbtHome, cache ) val stage2Args = new Stage2Args( new File( args.args(0) ), args.args.drop(1).dropWhile(_ == "direct").toVector, // launcher changes cause entire nailgun restart, so no need for them here stage2LastModified = stage2LastModified, - logger = logger, cache, cbtHome, new File(buildStage1.compatibilityClasspath) |