diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-05 17:54:47 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-05 17:54:47 -0800 |
| commit | 9547753a80fab450c842cb4a9a8296aa41875ff3 (patch) | |
| tree | 637acdd45dbf93ba87ae6cb67d4237da652ac8c1 /src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | |
| parent | 4b2330b3d3db4263a8b1e19b792596dd60d79045 (diff) | |
| parent | c42c1742e26dc47f940e4003e4ca25e8c738796d (diff) | |
| download | scala-9547753a80fab450c842cb4a9a8296aa41875ff3.tar.gz scala-9547753a80fab450c842cb4a9a8296aa41875ff3.tar.bz2 scala-9547753a80fab450c842cb4a9a8296aa41875ff3.zip | |
Merge pull request #1716 from paulp/merge-2.10
Merged 2.10.0/x into master.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/RefChecks.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 7a7c7c7d25..0ae225ccee 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -1382,8 +1382,8 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans private def checkCompileTimeOnly(sym: Symbol, pos: Position) = { if (sym.isCompileTimeOnly) { def defaultMsg = - s"""|Reference to ${sym.fullLocationString} should not have survived past type checking, - |it should have been processed and eliminated during expansion of an enclosing macro.""".stripMargin + sm"""Reference to ${sym.fullLocationString} should not have survived past type checking, + |it should have been processed and eliminated during expansion of an enclosing macro.""" // The getOrElse part should never happen, it's just here as a backstop. unit.error(pos, sym.compileTimeOnlyMessage getOrElse defaultMsg) } |