Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit e84e06c

Browse files
committed
Merge pull request scala#4632 from janekdb/2.11.x-names-t-v
Improve some names (t-v)
2 parents d48b45b + 63a18ac commit e84e06c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/compiler/scala/tools/nsc/typechecker/RefChecks.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,13 +1134,13 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans
11341134
t hasSymbolWhich (_.accessedOrSelf == valOrDef.symbol)
11351135
case _ => false
11361136
}
1137-
val trivialInifiniteLoop = (
1137+
val trivialInfiniteLoop = (
11381138
!valOrDef.isErroneous
11391139
&& !valOrDef.symbol.isValueParameter
11401140
&& valOrDef.symbol.paramss.isEmpty
11411141
&& callsSelf
11421142
)
1143-
if (trivialInifiniteLoop)
1143+
if (trivialInfiniteLoop)
11441144
reporter.warning(valOrDef.rhs.pos, s"${valOrDef.symbol.fullLocationString} does nothing other than call itself recursively")
11451145
}
11461146

test/files/run/test-cpp.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ object TestSetterInline {
4646
* The access of the local variable 'y' should be replaced by the
4747
* constant.
4848
*/
49-
object TestAliasChainConstat {
49+
object TestAliasChainConstant {
5050

5151
def main(args: Array[String]): Unit = {
5252
val x = 2

test/junit/scala/tools/nsc/doc/html/HtmlDocletTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import scala.tools.testing.AssertUtil._
1010
@RunWith(classOf[JUnit4])
1111
class HtmlDocletTest {
1212
@Test
13-
def testSyntaxHighlightningUnicode() {
13+
def testSyntaxHighlightingUnicode() {
1414
val in = "unicode: …"
1515

1616
val out = SyntaxHigh(in).toString

0 commit comments

Comments
 (0)