provide Resource for all closables

Author: Martijn Hoekstra

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

@@ -139,7 +139,8 @@ object Using {
 
     @inline def safeAddSuppressed(t: Throwable, suppressed: Throwable): Unit = {
       // don't `addSuppressed` to something which is a `ControlThrowable`
-      if (!t.isInstanceOf[ControlThrowable]) t.addSuppressed(suppressed)
+      // nor to scalaJS
+      if (!t.isInstanceOf[ControlThrowable] && (1.0.toString == "1.0")) t.addSuppressed(suppressed)
     }
 
     var primary: Throwable = null
@@ -281,9 +282,10 @@ object Using {
   }
 
   object Resource {
-    /** An implicit `Resource` for [[java.lang.AutoCloseable `AutoCloseable`s]]. */
-    implicit val autoCloseableResource: Resource[AutoCloseable] = new Resource[AutoCloseable] {
-      def release(resource: AutoCloseable) = resource.close()
+    import java.io.Closeable
+    /** An implicit `Resource` for [[java.lang.Closeable `Closeable`s]]. */
+    implicit val closeableResource: Resource[Closeable] = new Resource[Closeable] {
+      def release(resource: Closeable) = resource.close()
     }
   }
 

compat/src/test/scala/test/scala/util/UsingTest.scala

@@ -7,6 +7,7 @@ import org.junit.Assert._
 
 import scala.reflect.ClassTag
 import scala.util.control.ControlThrowable
+import java.io.Closeable
 
 @RunWith(classOf[JUnit4])
 class UsingTest {
@@ -380,19 +381,19 @@ class UsingTest {
 
   @Test
   def usingDisallowsNull(): Unit = {
-    val npe = catchThrowable(Using.resource(null: AutoCloseable)(_ => "test"))
+    val npe = catchThrowable(Using.resource(null: Closeable)(_ => "test"))
     assertThrowableClass[NullPointerException](npe)
   }
 
   @Test
   def safeUsingDisallowsNull(): Unit = {
-    val npe = Using(null: AutoCloseable)(_ => "test").failed.get
+    val npe = Using(null: Closeable)(_ => "test").failed.get
     assertThrowableClass[NullPointerException](npe)
   }
 
   @Test
   def safeUsingCatchesOpeningException(): Unit = {
-    val ex = Using({ throw new RuntimeException }: AutoCloseable)(_ => "test").failed.get
+    val ex = Using({ throw new RuntimeException }: Closeable)(_ => "test").failed.get
     assertThrowableClass[RuntimeException](ex)
   }
 }
@@ -405,7 +406,7 @@ object UsingTest {
   final class ClosingMarker(message: String) extends Throwable(message) with ControlThrowable
   final class UsingMarker(message: String) extends Throwable(message) with ControlThrowable
 
-  abstract class BaseResource extends AutoCloseable {
+  abstract class BaseResource extends Closeable {
     final def identity[A](a: A): A = a
   }