summaryrefslogtreecommitdiff
path: root/test/files/pos/t5957
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-07-19 16:34:57 +0200
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-07-19 16:34:57 +0200
commitee0d01785ebc7b72164ad4e0d6a952d99a5f21f2 (patch)
tree6d0ca1334d4b4674b984b344fa80d4a39520d9a5 /test/files/pos/t5957
parent45232af4de715ec118f8b9ab9cce25c33540c0d6 (diff)
downloadscala-ee0d01785ebc7b72164ad4e0d6a952d99a5f21f2.tar.gz
scala-ee0d01785ebc7b72164ad4e0d6a952d99a5f21f2.tar.bz2
scala-ee0d01785ebc7b72164ad4e0d6a952d99a5f21f2.zip
Deprecate all JVM 1.5 targets and make 1.6 default.
Add a check if deprecated target is being used. I put that check into `checkDeprecatedSettings`. I tried to invent some general mechanism for deprecating choices in ChoiceSetting but I gave up eventually. It wasn't worth it the complexity. Also, with current approach I'm able to provide nice, customized deprecation warning. Make `jvm-1.6` a default backend. Altered test for SI-5957 because it crashes the backend. However, the problem is not with backend but with symbol creation. We get two different symbols with the same internal name and both are used in trees that reach GenASM. See SI-6109 for details. Review by @magarciaEPFL and @paulp.
Diffstat (limited to 'test/files/pos/t5957')
-rw-r--r--test/files/pos/t5957/T_1.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/files/pos/t5957/T_1.scala b/test/files/pos/t5957/T_1.scala
index 1db5a3891f..339dcbf0f0 100644
--- a/test/files/pos/t5957/T_1.scala
+++ b/test/files/pos/t5957/T_1.scala
@@ -1,6 +1,8 @@
abstract class T {
- def t1: Test$Bar
+ // see: SI-6109
+ // def t1: Test$Bar
def t2: Test#Bar
- def t3: Test$Baz
+ // see: SI-6109
+ // def t3: Test$Baz
def t4: Test.Baz
}