diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 1 | ||||
| -rw-r--r-- | test/scaladoc/run/SI-6812.scala | 24 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 14f8f6e9bb..9fe3016c02 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -163,7 +163,6 @@ trait ScalaSettings extends AbsScalaSettings = ChoiceSetting ("-Ystruct-dispatch", "policy", "structural method dispatch policy", List("no-cache", "mono-cache", "poly-cache", "invoke-dynamic"), "poly-cache") val Yrangepos = BooleanSetting ("-Yrangepos", "Use range positions for syntax trees.") val Yreifycopypaste = BooleanSetting ("-Yreify-copypaste", "Dump the reified trees in copypasteable representation.") - val Ymacronoexpand = BooleanSetting ("-Ymacro-no-expand", "Don't expand macros. Might be useful for scaladoc and presentation compiler, but will crash anything which uses macros and gets past typer.") val Yreplsync = BooleanSetting ("-Yrepl-sync", "Do not use asynchronous code for repl startup") val Yreploutdir = StringSetting ("-Yrepl-outdir", "path", "Write repl-generated classfiles to given output directory (use \"\" to generate a temporary dir)" , "") val Ynotnull = BooleanSetting ("-Ynotnull", "Enable (experimental and incomplete) scala.NotNull.") diff --git a/test/scaladoc/run/SI-6812.scala b/test/scaladoc/run/SI-6812.scala deleted file mode 100644 index fbd9588ede..0000000000 --- a/test/scaladoc/run/SI-6812.scala +++ /dev/null @@ -1,24 +0,0 @@ -import scala.tools.nsc.doc.model._ -import scala.tools.partest.ScaladocModelTest -import language._ - -object Test extends ScaladocModelTest { - - override def code = """ - import scala.reflect.macros.Context - import language.experimental.macros - - object Macros { - def impl(c: Context) = c.literalUnit - def foo = macro impl - } - - class C { - def bar = Macros.foo - } - """ - - def scaladocSettings = "" - override def extraSettings = super.extraSettings + " -Ymacro-no-expand" - def testModel(root: Package) = () -} |