diff options
| author | Janek Bogucki <janekdb@gmail.com> | 2015-07-15 11:09:52 +0100 |
|---|---|---|
| committer | Janek Bogucki <janekdb@gmail.com> | 2015-07-15 11:09:52 +0100 |
| commit | 63a18ac35b70f01a7693f5b05f7176f22b38b3c1 (patch) | |
| tree | 3a109fd6033940dbed13dec541b822920236a054 | |
| parent | 52fde52920d93325310e5544991feeea03e5c763 (diff) | |
| download | scala-63a18ac35b70f01a7693f5b05f7176f22b38b3c1.tar.gz scala-63a18ac35b70f01a7693f5b05f7176f22b38b3c1.tar.bz2 scala-63a18ac35b70f01a7693f5b05f7176f22b38b3c1.zip | |
Improve some names (t-v)
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 4 | ||||
| -rw-r--r-- | test/files/run/test-cpp.scala | 2 | ||||
| -rw-r--r-- | test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 4b30b4e436..36423fa2aa 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -1134,13 +1134,13 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans t hasSymbolWhich (_.accessedOrSelf == valOrDef.symbol) case _ => false } - val trivialInifiniteLoop = ( + val trivialInfiniteLoop = ( !valOrDef.isErroneous && !valOrDef.symbol.isValueParameter && valOrDef.symbol.paramss.isEmpty && callsSelf ) - if (trivialInifiniteLoop) + if (trivialInfiniteLoop) reporter.warning(valOrDef.rhs.pos, s"${valOrDef.symbol.fullLocationString} does nothing other than call itself recursively") } diff --git a/test/files/run/test-cpp.scala b/test/files/run/test-cpp.scala index 4e00e72658..4fca67d51e 100644 --- a/test/files/run/test-cpp.scala +++ b/test/files/run/test-cpp.scala @@ -46,7 +46,7 @@ object TestSetterInline { * The access of the local variable 'y' should be replaced by the * constant. */ -object TestAliasChainConstat { +object TestAliasChainConstant { def main(args: Array[String]): Unit = { val x = 2 diff --git a/test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala b/test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala index 13a955b55d..d17856eb54 100644 --- a/test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala +++ b/test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala @@ -10,7 +10,7 @@ import scala.tools.testing.AssertUtil._ @RunWith(classOf[JUnit4]) class HtmlDocletTest { @Test - def testSyntaxHighlightningUnicode() { + def testSyntaxHighlightingUnicode() { val in = "unicode: …" val out = SyntaxHigh(in).toString |