summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-02-21 22:01:07 +0000
committerMartin Odersky <odersky@gmail.com>2011-02-21 22:01:07 +0000
commit0848855e2edb021f56e49373d2753e8e931f8b33 (patch)
treedddd2b553ae23361ee5d247d43d32c54bb3702ac
parentd610e36fa53fcd8b6361293936af057b8563c33b (diff)
downloadscala-0848855e2edb021f56e49373d2753e8e931f8b33.tar.gz
scala-0848855e2edb021f56e49373d2753e8e931f8b33.tar.bz2
scala-0848855e2edb021f56e49373d2753e8e931f8b33.zip
changed test output and comment, because mixed ...
changed test output and comment, because mixed in fields and methods no longer get a generic signature. Review by extempore.
-rw-r--r--test/files/run/t3857.check2
-rw-r--r--test/files/run/t3857.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/t3857.check b/test/files/run/t3857.check
index 11c05783d9..af416a590b 100644
--- a/test/files/run/t3857.check
+++ b/test/files/run/t3857.check
@@ -1,2 +1,2 @@
private java.util.Set<java.lang.String> ScalaGeneric.s
-private java.util.Set<java.lang.String> ScalaGeneric2.s \ No newline at end of file
+private java.util.Set ScalaGeneric2.s
diff --git a/test/files/run/t3857.scala b/test/files/run/t3857.scala
index 53afb33ba2..6dfefa22c6 100644
--- a/test/files/run/t3857.scala
+++ b/test/files/run/t3857.scala
@@ -8,5 +8,5 @@ object Test extends App {
// java.util.Set<java.lang.String> ScalaGeneric.s
println(classOf[ScalaGeneric2].getDeclaredField("s").toGenericString)
- // java.util.Set ScalaGeneric2.s -- should be same as above
+ // java.util.Set ScalaGeneric2.s -- no signature should be found because it was mixed in.
}