Merge pull request scala#4632 from janekdb/2.11.x-names-t-v

Improve some names (t-v)
SethTisue · Jul 20, 2015 · e84e06c · e84e06c
2 parents d48b45b + 63a18ac
commit e84e06c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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