| ➜ scala-2 git:(2.12.x) g show | |
| ➜ scala-2 git:(2.12.x) g --no-pager show | |
| commit 4fc7d5517c (HEAD -> 2.12.x, scala/2.12.x) | |
| Merge: 7baf7c82f1 a66de94625 | |
| Author: Adriaan Moors <adriaan.moors@typesafe.com> | |
| Date: 5 hours ago | |
| Merge pull request #5066 from acjay/cleanup_scaladoc_hover | |
| minor style updates for Scaladoc formatting |
| ➜ sbt git:(inc-comp-stable-self) sbt | |
| [info] Loading project definition from /Users/adriaan/git/sbt/project | |
| [info] Updating {file:/Users/adriaan/git/sbt/project/}sbt-build... | |
| [info] Resolving org.fusesource.jansi#jansi;1.4 ... | |
| [info] downloading https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt/0.13.7/jars/sbt.jar ... | |
| [info] [SUCCESSFUL ] org.scala-sbt#sbt;0.13.7!sbt.jar (2087ms) | |
| [info] downloading https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/main/0.13.7/jars/main.jar ... | |
| [info] [SUCCESSFUL ] org.scala-sbt#main;0.13.7!main.jar (10807ms) | |
| [info] downloading https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/0.13.7/jars/compiler-interface-bin.jar ... | |
| [info] [SUCCESSFUL ] org.scala-sbt#compiler-interface;0.13.7!compiler-interface-bin.jar (5799ms) |
| diff --git i/library/scala/collection/mutable/AnyRefMap$.class w/library/scala/collection/mutable/AnyRefMap$.class | |
| index 52eac108f2..f8c6907ee1 100644 | |
| --- i/library/scala/collection/mutable/AnyRefMap$.class | |
| +++ w/library/scala/collection/mutable/AnyRefMap$.class | |
| @@ -10,22 +10,10 @@ public final class scala/collection/mutable/AnyRefMap$ implements scala/Serializ | |
| // access flags 0x100A | |
| private static synthetic Ljava/util/Map; $deserializeLambdaCache$ | |
| - // access flags 0x12 | |
| - private final I IndexMask |
| ➜ scala git:(traits-late-fields) ✗ diffstrap | |
| Reinitialized existing Git repository in /Users/adriaan/git/scala/classes-repo/.git/ | |
| [master 3ac3984642] quick | |
| 259 files changed, 18 insertions(+), 13 deletions(-) | |
| create mode 100644 compiler/scala/tools/nsc/transform/Constructors$ConstructorTransformer$$anonfun$37.class | |
| create mode 100644 compiler/scala/tools/nsc/transform/Constructors$TemplateTransformer$$anonfun$38.class | |
| rewrite compiler/scala/tools/nsc/transform/Fields$FieldsTransformer.class (89%) | |
| create mode 100644 compiler/scala/tools/nsc/transform/Fields$synthFieldsAndAccessors$$anonfun$28.class | |
| create mode 100644 compiler/scala/tools/nsc/transform/Fields$synthFieldsAndAccessors$.class | |
| rewrite compiler/scala/tools/nsc/transform/Fields.class (92%) |
| +++ w/compiler/scala/reflect/reify/phases/Calculate$$anon$1.class | |
| - OUTERCLASS scala/reflect/reify/phases/Calculate null | |
| + OUTERCLASS scala/reflect/reify/phases/Calculate calculate ()Lscala/reflect/api/Trees$Traverser; | |
| --- i/compiler/scala/reflect/reify/phases/Metalevels$$anon$1.class | |
| +++ w/compiler/scala/reflect/reify/phases/Metalevels$$anon$1.class | |
| - OUTERCLASS scala/reflect/reify/phases/Metalevels null | |
| + OUTERCLASS scala/reflect/reify/phases/Metalevels metalevels ()Lscala/tools/nsc/ast/Trees$Transformer; | |
| --- i/compiler/scala/reflect/reify/phases/Reshape$$anon$1.class | |
| +++ w/compiler/scala/reflect/reify/phases/Reshape$$anon$1.class | |
| - OUTERCLASS scala/reflect/reify/phases/Reshape null |
| diff --git i/compiler/compiler.properties w/compiler/compiler.properties | |
| index 22bdfa688a..0eaeba5d97 100644 | |
| --- i/compiler/compiler.properties | |
| +++ w/compiler/compiler.properties | |
| @@ -1,4 +1,4 @@ | |
| -#Wed, 02 Sep 2015 13:25:27 -0700 | |
| +#Wed, 02 Sep 2015 13:35:37 -0700 | |
| version.number=2.12.0-20150831-105851-fcbb0e2620 | |
| maven.version.number=2.12.0-SNAPSHOT |
| trait T { | |
| val pub = "public" | |
| } | |
| class extends T | |
| ------ | |
| trait T { | |
| def pub: String = "public" | |
| def pub_=(b: String): Unit = ??? | |
| } | |
| class extends T |
| #!/bin/bash | |
| # Requires curl, jq (https://stedolan.github.io/jq/) and perl | |
| # Public domain. | |
| trim=${1-S} | |
| # F01: Charge Package | |
| # F02: LED Headlights and Quick Charge Port Package | |
| # P01: Premium Package | |
| # E10: Pearl White Special Paint | |
| package=${2-F01} |
| // See https://docs.oracle.com/javase/tutorial/java/IandI/override.html#default | |
| /**** This Scala code must compile to the bytecode generated by the below Java | |
| class C { def foo = "C" } // `foo` is called an "instance method" in Java | |
| trait T extends C { override def foo = "T" } // default method loses against instance method foo (defined in class C) | |
| class D extends T | |
| assert((new D).foo == "T") |
I envision scabot running a final validation job on the merge commit of a PR into master after someone says /merge, and pushing that straight back to master once the tests pass.