diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-02-24 18:06:32 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-02-24 18:06:32 -0800 |
commit | d375334c26c625da345c5e77bca2975f21b8bd10 (patch) | |
tree | 834c9358874468c3bfef2c636392cd241d6e8833 /test/files/neg | |
parent | 1421e3c66c7bc50c54759e48a7492923e391d186 (diff) | |
parent | b7626d998ee415271105450f125c507629b8eae2 (diff) | |
download | scala-d375334c26c625da345c5e77bca2975f21b8bd10.tar.gz scala-d375334c26c625da345c5e77bca2975f21b8bd10.tar.bz2 scala-d375334c26c625da345c5e77bca2975f21b8bd10.zip |
Merge pull request #4968 from lrytz/oldOptCleanup
Remove -Y settings that are no longer used in 2.12
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/case-collision2.flags | 2 | ||||
-rw-r--r-- | test/files/neg/incompatibleSettings.check | 6 | ||||
-rw-r--r-- | test/files/neg/incompatibleSettings.flags | 1 | ||||
-rw-r--r-- | test/files/neg/inlineMaxSize.flags | 2 | ||||
-rw-r--r-- | test/files/neg/optimiseDeprecated.check | 4 | ||||
-rw-r--r-- | test/files/neg/optimiseDeprecated.flags | 1 | ||||
-rw-r--r-- | test/files/neg/optimiseDeprecated.scala (renamed from test/files/neg/incompatibleSettings.scala) | 0 | ||||
-rw-r--r-- | test/files/neg/sealed-final-neg.flags | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/test/files/neg/case-collision2.flags b/test/files/neg/case-collision2.flags index bea46902c9..85d8eb2ba2 100644 --- a/test/files/neg/case-collision2.flags +++ b/test/files/neg/case-collision2.flags @@ -1 +1 @@ --Ybackend:GenBCode -Xfatal-warnings +-Xfatal-warnings diff --git a/test/files/neg/incompatibleSettings.check b/test/files/neg/incompatibleSettings.check deleted file mode 100644 index 0f28d41825..0000000000 --- a/test/files/neg/incompatibleSettings.check +++ /dev/null @@ -1,6 +0,0 @@ -warning: Conflicting compiler settings were detected. Some settings will be ignored. -Compiler settings for the 2.11 optimizer (-optimise) are incompatible with -Ybackend:GenBCode (which is the default in 2.12). -The optimizer settings are ignored. See -Yopt:help for enabling the new optimizer in 2.12. -error: No warnings can be incurred under -Xfatal-warnings. -one warning found -one error found diff --git a/test/files/neg/incompatibleSettings.flags b/test/files/neg/incompatibleSettings.flags deleted file mode 100644 index 00dd9c1c24..0000000000 --- a/test/files/neg/incompatibleSettings.flags +++ /dev/null @@ -1 +0,0 @@ --optimise -Ybackend:GenBCode -Xfatal-warnings diff --git a/test/files/neg/inlineMaxSize.flags b/test/files/neg/inlineMaxSize.flags index 9c6b811622..18b474e797 100644 --- a/test/files/neg/inlineMaxSize.flags +++ b/test/files/neg/inlineMaxSize.flags @@ -1 +1 @@ --Ybackend:GenBCode -Ydelambdafy:method -Yopt:l:classpath -Yopt-warnings -Xfatal-warnings
\ No newline at end of file +-Ydelambdafy:method -Yopt:l:classpath -Yopt-warnings -Xfatal-warnings
\ No newline at end of file diff --git a/test/files/neg/optimiseDeprecated.check b/test/files/neg/optimiseDeprecated.check new file mode 100644 index 0000000000..d51d48f023 --- /dev/null +++ b/test/files/neg/optimiseDeprecated.check @@ -0,0 +1,4 @@ +warning: -optimise is deprecated: In 2.12, -optimise enables -Yopt:l:classpath. Check -Yopt:help for using the Scala 2.12 optimizer. +error: No warnings can be incurred under -Xfatal-warnings. +one warning found +one error found diff --git a/test/files/neg/optimiseDeprecated.flags b/test/files/neg/optimiseDeprecated.flags new file mode 100644 index 0000000000..42fca6d836 --- /dev/null +++ b/test/files/neg/optimiseDeprecated.flags @@ -0,0 +1 @@ +-optimise -deprecation -Xfatal-warnings diff --git a/test/files/neg/incompatibleSettings.scala b/test/files/neg/optimiseDeprecated.scala index 826a1a5bc2..826a1a5bc2 100644 --- a/test/files/neg/incompatibleSettings.scala +++ b/test/files/neg/optimiseDeprecated.scala diff --git a/test/files/neg/sealed-final-neg.flags b/test/files/neg/sealed-final-neg.flags index 01bd79154a..673aca8931 100644 --- a/test/files/neg/sealed-final-neg.flags +++ b/test/files/neg/sealed-final-neg.flags @@ -1 +1 @@ --Xfatal-warnings -Yopt:l:project -Yinline-warnings
\ No newline at end of file +-Xfatal-warnings -Yopt:l:project -Yopt-warnings
\ No newline at end of file |