diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-06-29 12:14:05 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-06-29 12:14:05 +1000 |
| commit | 04e7448d42492c0f35a42c69cbac41a8cdff724e (patch) | |
| tree | bb02c70f8451106212bdff5b06f574b68cdf59f8 /test/files/run | |
| parent | 1b25705c662aba04cdd3d16b790963856b16206b (diff) | |
| parent | 0ff6c81dd3e3e3a60d8f2db845ada167c8266395 (diff) | |
| download | scala-04e7448d42492c0f35a42c69cbac41a8cdff724e.tar.gz scala-04e7448d42492c0f35a42c69cbac41a8cdff724e.tar.bz2 scala-04e7448d42492c0f35a42c69cbac41a8cdff724e.zip | |
Merge pull request #4589 from janekdb/2.11.x-method-names-m-o
Improve method names (m-o)
Diffstat (limited to 'test/files/run')
| -rw-r--r-- | test/files/run/finally.check | 2 | ||||
| -rw-r--r-- | test/files/run/finally.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/run/finally.check b/test/files/run/finally.check index 901a797426..b0f2293d11 100644 --- a/test/files/run/finally.check +++ b/test/files/run/finally.check @@ -29,7 +29,7 @@ body in finally java.lang.Exception ---------------------------------------- -Running nestedFinalies +Running nestedFinallyBlocks in finally 1 in finally 2 ---------------------------------------- diff --git a/test/files/run/finally.scala b/test/files/run/finally.scala index b66354ca03..467c9e5868 100644 --- a/test/files/run/finally.scala +++ b/test/files/run/finally.scala @@ -94,7 +94,7 @@ object Test extends App { } // nested finally blocks with return value - def nestedFinalies: Int = + def nestedFinallyBlocks: Int = try { try { return 10 @@ -123,5 +123,5 @@ object Test extends App { test(throwBody, "throwBody") test(retFinally, "retFinally") test(throwFinally, "throwFinally") - test(nestedFinalies, "nestedFinalies") + test(nestedFinallyBlocks, "nestedFinallyBlocks") } |