adapted Using

de-SAM, no trailing commas

Author: Martijn Hoekstra

src/library/scala/util/Using.scala renamed to compat/src/main/scala-2.11_2.12/scala/util/compat/Using.scala

@@ -1,8 +1,9 @@
-package scala.util
+package scala.util.compat
 
 import java.util.concurrent.atomic.AtomicBoolean
 
 import scala.util.control.{ControlThrowable, NonFatal}
+import scala.util._
 
 /** A utility for performing automatic resource management. It can be used to perform an
   * operation using resources, after which it will release the resources, in reverse order
@@ -281,7 +282,9 @@ object Using {
 
   object Resource {
     /** An implicit `Resource` for [[java.lang.AutoCloseable `AutoCloseable`s]]. */
-    implicit val autoCloseableResource: Resource[AutoCloseable] = (resource: AutoCloseable) => resource.close()
+    implicit val autoCloseableResource: Resource[AutoCloseable] = new Resource[AutoCloseable] {
+      def release(resource: AutoCloseable) = resource.close()
+    }
   }
 
 }

compat/src/main/scala-2.13/scala/util/compat/package.scala

@@ -1,8 +1,11 @@
-package scala.util
-
-package object compat {
-  /**
-   * Adds chaining methods `tap` and `pipe` to every type. See [[ChainingOps]].
-   */
-  object chainingOps extends ChainingSyntax
-}
+package scala.util
+
+package object compat {
+  /**
+   * Adds chaining methods `tap` and `pipe` to every type. See [[ChainingOps]].
+   */
+  object chainingOps extends ChainingSyntax
+
+  type Using[R] = scala.util.Using[R]
+  val Using = scala.util.Using
+}

test/junit/scala/util/UsingTest.scala renamed to compat/src/test/scala/test/scala/util/UsingTest.scala

@@ -1,4 +1,4 @@
-package scala.util
+package scala.util.compat
 
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -310,7 +310,7 @@ class UsingTest {
     val group = new ResourceGroup
     val res = Using.resources(
       group.newResource(),
-      group.newResource(),
+      group.newResource()
     ) { (r1, r2) =>
       r1.identity(1) + r2.identity(1)
     }
@@ -323,7 +323,7 @@ class UsingTest {
     val res = Using.resources(
       group.newResource(),
       group.newResource(),
-      group.newResource(),
+      group.newResource()
     ) { (r1, r2, r3) =>
       r1.identity(1) +
         r2.identity(1) +
@@ -339,7 +339,7 @@ class UsingTest {
       group.newResource(),
       group.newResource(),
       group.newResource(),
-      group.newResource(),
+      group.newResource()
     ) { (r1, r2, r3, r4) =>
       r1.identity(1) +
         r2.identity(1) +