diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-02-15 16:56:48 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-02-16 16:43:34 +0100 |
| commit | b7626d998ee415271105450f125c507629b8eae2 (patch) | |
| tree | fd201d898e7d67dbdabdd116f1f27710718b98d6 /test/files/neg | |
| parent | ce3a8030fa59e5a9082528bf6f1ffc12a9277bc9 (diff) | |
| download | scala-b7626d998ee415271105450f125c507629b8eae2.tar.gz scala-b7626d998ee415271105450f125c507629b8eae2.tar.bz2 scala-b7626d998ee415271105450f125c507629b8eae2.zip | |
Remove -Y settings that are no longer used in 2.12
Added a deprecation warning for `-optimize`.
Later we'll also graduate `-Yopt` to `-opt`, probably for 2.12.0-M5.
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 |
7 files changed, 7 insertions, 9 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 |