diff options
author | Paul Phillips <paulp@improving.org> | 2013-01-15 07:27:53 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-01-15 07:27:53 -0800 |
commit | 621f7a56c21686ebbd39b8ffe9282f917fe1f128 (patch) | |
tree | 028f2fa82d23ad70936051bbc1aa7cb6fb55b897 | |
parent | 9731065e4ed59cce2d9bb435b0ea94aae826bea3 (diff) | |
parent | 0c2e8842036876c6b824fbbb68fc7100ef62e02d (diff) | |
download | scala-621f7a56c21686ebbd39b8ffe9282f917fe1f128.tar.gz scala-621f7a56c21686ebbd39b8ffe9282f917fe1f128.tar.bz2 scala-621f7a56c21686ebbd39b8ffe9282f917fe1f128.zip |
Merge pull request #1895 from JamesIry/SI_6963_2.10.x
SI-6963 Deprecates -Xmigration switch
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 3 | ||||
-rw-r--r-- | test/files/neg/t6963.check | 2 | ||||
-rw-r--r-- | test/files/neg/t6963.flags | 1 | ||||
-rw-r--r-- | test/files/neg/t6963.scala | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 517b91dca8..b820d10ddc 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -85,7 +85,8 @@ trait ScalaSettings extends AbsScalaSettings val logFreeTerms = BooleanSetting ("-Xlog-free-terms", "Print a message when reification creates a free term.") val logFreeTypes = BooleanSetting ("-Xlog-free-types", "Print a message when reification resorts to generating a free type.") val maxClassfileName = IntSetting ("-Xmax-classfile-name", "Maximum filename length for generated classes", 255, Some((72, 255)), _ => None) - val Xmigration28 = BooleanSetting ("-Xmigration", "Warn about constructs whose behavior may have changed between 2.7 and 2.8.") + val Xmigration28 = BooleanSetting ("-Xmigration", "Warn about constructs whose behavior may have changed between 2.7 and 2.8."). + withDeprecationMessage("This setting is no longer useful and will be removed. Please remove it from your build.") val nouescape = BooleanSetting ("-Xno-uescape", "Disable handling of \\u unicode escapes.") val Xnojline = BooleanSetting ("-Xnojline", "Do not use JLine for editing.") val Xverify = BooleanSetting ("-Xverify", "Verify generic signatures in generated bytecode (asm backend only.)") diff --git a/test/files/neg/t6963.check b/test/files/neg/t6963.check new file mode 100644 index 0000000000..41cb796b0b --- /dev/null +++ b/test/files/neg/t6963.check @@ -0,0 +1,2 @@ +error: -Xmigration is deprecated: This setting is no longer useful and will be removed. Please remove it from your build. +one error found diff --git a/test/files/neg/t6963.flags b/test/files/neg/t6963.flags new file mode 100644 index 0000000000..0b6d71496a --- /dev/null +++ b/test/files/neg/t6963.flags @@ -0,0 +1 @@ +-Xmigration -deprecation -Xfatal-warnings
\ No newline at end of file diff --git a/test/files/neg/t6963.scala b/test/files/neg/t6963.scala new file mode 100644 index 0000000000..4da52764f5 --- /dev/null +++ b/test/files/neg/t6963.scala @@ -0,0 +1,3 @@ + +object test { +} |