diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-01-20 16:02:53 +0300 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-01-20 16:02:53 +0300 |
| commit | 554fc3e71481159237dee4c343a9fb24b1c82e68 (patch) | |
| tree | 56560400b2d19e41c46b7d3083a58d811f5922d7 | |
| parent | 2d0aaf555dc3d43e245162a73ff06ed99667a6ee (diff) | |
| download | scala-554fc3e71481159237dee4c343a9fb24b1c82e68.tar.gz scala-554fc3e71481159237dee4c343a9fb24b1c82e68.tar.bz2 scala-554fc3e71481159237dee4c343a9fb24b1c82e68.zip | |
addresses pull request feedback
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/t8158.check | 2 | ||||
| -rw-r--r-- | test/files/run/t5256h.check | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 54e5b2781e..f49ddaf6ca 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -2536,7 +2536,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => case PolyType(tparams, res) => typeParamsString(tp) + infoString(res) case NullaryMethodType(res) => infoString(res) case MethodType(params, res) => valueParamsString(tp) + infoString(res) - case _ if isStructuralThisType => ": this.type" + case _ if isStructuralThisType => ": " + owner.name case _ => ": " + tp } } diff --git a/test/files/neg/t8158.check b/test/files/neg/t8158.check index aaa62ddea4..fa6b744ba5 100644 --- a/test/files/neg/t8158.check +++ b/test/files/neg/t8158.check @@ -1,4 +1,4 @@ -Test_2.scala:10: error: not enough patterns for <$anon: AnyRef> offering AnyRef{def isEmpty: Boolean; def get: this.type; def unapply(x: String): this.type}: expected 1, found 0 +Test_2.scala:10: error: not enough patterns for <$anon: AnyRef> offering AnyRef{def isEmpty: Boolean; def get: $anon; def unapply(x: String): $anon}: expected 1, found 0 case X() => ^ one error found diff --git a/test/files/run/t5256h.check b/test/files/run/t5256h.check index 300a40f653..dc3e919897 100644 --- a/test/files/run/t5256h.check +++ b/test/files/run/t5256h.check @@ -3,5 +3,5 @@ Test.$anon$1 java.lang.Object { final private val x: Int def x(): Int - def <init>(): this.type + def <init>(): $anon$1 } |