summaryrefslogtreecommitdiff
path: root/test/junit
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-06-23 11:59:11 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-06-23 11:59:11 +1000
commit1b09e12ef3b3fea1cab56bac893295f74de23b8b (patch)
tree901ce1962f4ebc90d37c8f947f8ca1331d3faf88 /test/junit
parent1fbce4612c21a4d0c553ea489b4765494828c09f (diff)
parentada9fa0b91ddb64f6d15f7616b455247cbcf2243 (diff)
downloadscala-1b09e12ef3b3fea1cab56bac893295f74de23b8b.tar.gz
scala-1b09e12ef3b3fea1cab56bac893295f74de23b8b.tar.bz2
scala-1b09e12ef3b3fea1cab56bac893295f74de23b8b.zip
Merge pull request #4574 from janekdb/2.11.x-typos-g-i
Fix 25 typos (g-i)
Diffstat (limited to 'test/junit')
-rw-r--r--test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala2
-rw-r--r--test/junit/scala/tools/nsc/backend/jvm/opt/MethodLevelOpts.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
index b8c5f85c49..0309bb97cc 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
@@ -503,7 +503,7 @@ class InlinerTest extends ClearAfterClass {
|class C extends T
""".stripMargin
val List(c, t, tClass) = compile(code)
- // the static implementaiton method is inlined into the mixin, so there's no invocation in the mixin
+ // the static implementation method is inlined into the mixin, so there's no invocation in the mixin
assertNoInvoke(getSingleMethod(c, "f"))
}
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/MethodLevelOpts.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/MethodLevelOpts.scala
index 1ce1b88ff2..5ef2458c0a 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/MethodLevelOpts.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/MethodLevelOpts.scala
@@ -56,7 +56,7 @@ class MethodLevelOpts extends ClearAfterClass {
}
@Test
- def inlineReturnInCachtNotTry(): Unit = {
+ def inlineReturnInCatchNotTry(): Unit = {
val code = "def f: Int = return { try 1 catch { case _: Throwable => 2 } }"
// cannot inline the IRETURN into the try block (because RETURN may throw IllegalMonitorState)
val m = singleMethod(methodOptCompiler)(code)