Use suggested fix for file close

liufengyun · liufengyun · commit 0bdab09e348b · 2020-09-03T10:35:42.000+02:00
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -609,11 +609,8 @@ trait ParallelTesting extends RunnerOrchestration { self =>
           val checkFile = checkFiles(file)
           val actual = {
             val source = Source.fromFile(file, StandardCharsets.UTF_8.name)
-            val lines  = source.getLines().toList
-            try source.close()
-            catch
-              case _: IOException => // ignore file close errors
-            lines
+            try source.getLines().toList
+            finally source.close()
           }
           diffTest(testSource, checkFile, actual, reporters, logger)
       }

Original file line number	Diff line number	Diff line change
`@@ -609,11 +609,8 @@ trait ParallelTesting extends RunnerOrchestration { self =>`
`609`	`609`	`val checkFile = checkFiles(file)`
`610`	`610`	`val actual = {`
`611`	`611`	`val source = Source.fromFile(file, StandardCharsets.UTF_8.name)`
`612`		`- val lines = source.getLines().toList`
`613`		`- try source.close()`
`614`		`- catch`
`615`		`- case _: IOException => // ignore file close errors`
`616`		`- lines`
	`612`	`+ try source.getLines().toList`
	`613`	`+ finally source.close()`
`617`	`614`	`}`
`618`	`615`	`diffTest(testSource, checkFile, actual, reporters, logger)`
`619`	`616`	`}`