gkossakowski

From dfc0d56bb05fdf92bf343eae96a0487b89eb8412 Mon Sep 17 00:00:00 2001
From: Grzegorz Kossakowski <[email protected]>
Date: Wed, 8 Jan 2014 22:50:54 +0100
Subject: [PATCH] Do not compute name hashes when name hashing is disabled

We should compute name hashes only when name hashing is enabled.
Otherwise, we just store an empty value for name hashes.
---
 compile/inc/src/main/scala/sbt/inc/Compile.scala | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

gkossakowski

[info] Loading global plugins from /Users/grek/.sbt/0.13/plugins
[info] Loading project definition from /Users/grek/scala/xsbt/project
[info] Set current project to root (in build file:/Users/grek/scala/xsbt/)
> clean
[success] Total time: 1 s, completed Nov 12, 2013 7:48:09 PM
> compile
[info] Updating {file:/Users/grek/scala/xsbt/}launcher-interface...
[info] Updating {file:/Users/grek/scala/xsbt/}control...
[info] Updating {file:/Users/grek/scala/xsbt/}interface...
[info] Updating {file:/Users/grek/scala/xsbt/}collections...

gkossakowski

Grzegorzs-MacBook-Pro:scala-ide grek ((ec13fb7...))$ git rev-parse HEAD
ec13fb755717ae2d4019e52f0405e3d1c0cc1c92
Grzegorzs-MacBook-Pro:scala-ide grek ((ec13fb7...))$ git diff
diff --git a/pom.xml b/pom.xml
index 856d6f4..3f8013f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
     <profile>
       <id>scala-2.10.x</id>

gkossakowski

[info] Compiling 291 Scala sources to /Users/grek/scala/scala-master/projects/compiler/target/scala-2.11.0-SNAPSHOT/classes...
[success] Total time: 132 s, completed Oct 29, 2013 9:37:47 PM
> last
[debug] Other repositories:
[debug] 	FileRepository(publish-m2-local,FileConfiguration(true,None),Patterns(ivyPatterns=List(), artifactPatterns=List(/Users/grek/.m2/repository/[organisation]/[module](_[scalaVersion])(_[sbtVersion])/[revision]/[artifact]-[revision](-[classifier]).[ext]), isMavenCompatible=true, descriptorOptional=false, skipConsistencyCheck=false))
[debug] 	FileRepository(file,FileConfiguration(true,None),Patterns(ivyPatterns=List(), artifactPatterns=List(/Users/grek/.m2/repository/[organisation]/[module](_[scalaVersion])(_[sbtVersion])/[revision]/[artifact]-[revision](-[classifier]).[ext]), isMavenCompatible=true, descriptorOptional=false, skipConsistencyCheck=false))
[debug] Default repositories:
[debug] 	Raw(ProjectResolver(inter-project, mapped: ))
[debug] 	FileRepository(local,FileConfiguration(

gkossakowski

diff --git a/build.sbt b/build.sbt
index 7b3dd09..d7cfadc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,14 +2,16 @@ organization := "org.scala-lang.modules"
 
 name := "scala-parser-combinators"
 
-version := "1.0.0-SNAPSHOT"
+version := "1.0.0-RC3"

gkossakowski

diff --git a/build.sbt b/build.sbt
index 8cd957a..50d4075 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,15 +2,15 @@ organization := "org.scala-lang.modules"
 
 name := "scala-xml"
 
-version := "1.0.0-SNAPSHOT"
+version := "1.0.0-RC5"

gkossakowski

[info] *** 9 TESTS FAILED ***
[info] TestLocationFunctionPathFunSpec:
[info] A Spec 
[info] - cancel !!! CANCELED !!! (0 milliseconds)
[info]   org.scalatest.exceptions.TestCanceledException was thrown. (LocationFunctionSuiteProp.scala:491)
[info] OldDocSpec:
[info] A Doc with no include calls inside 
[info] - should send the markup unindented out the door *** FAILED *** (52 milliseconds)
[info]   TestFailedException was thrown during property evaluation. (OldDocSpec.scala:64)
[info]     Message: "[]" did not equal "[This is a Title

gkossakowski

test foo

gkossakowski

package test

import scala.tools.nsc.Global

object BenchmarkScalac {
  
  def main(args: Array[String]): Unit = {
    val args = assembleCompilerArgs
    benchmarkClasspathMemoryConsumption(args)
  }

gkossakowski

// fails to compile with:
//Cakey.scala:7: error: overriding value platform in trait SymbolLoaders of type Platform{type SymbolLoader = GlobalSymbolLoaders.this.SymbolLoader};
// value platform has incompatible type
//    val platform: ThisPlatform = Global.this.platform
//        ^
//one error found

class Global {
  type ThisPlatform = Platform {
    type SymbolLoader = Global.this.loaders.SymbolLoader