Skip to content

Commit 02adc92

Browse files
committed
adjust UsingTest to compile on 2.11
1 parent 6ed585a commit 02adc92

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class UsingTest {
117117
def check[UseT <: Throwable: ClassTag](
118118
t: String => UseT,
119119
behavior: ThrowBehavior,
120-
allowsSuppression: Boolean,
120+
allowsSuppression: Boolean
121121
): Unit = {
122122
val ex = useWrapped(resource, t)
123123
if (behavior == UseIsThrown) {
@@ -211,7 +211,7 @@ class UsingTest {
211211
def check[UseT <: Throwable: ClassTag](
212212
t: String => UseT,
213213
behavior: ThrowBehavior,
214-
allowsSuppression: Boolean,
214+
allowsSuppression: Boolean
215215
): Unit = {
216216
val ex = useManager(resource, t)
217217
if (behavior == UseIsThrown) {
@@ -616,7 +616,7 @@ class UsingTest {
616616
val group = new ResourceGroup
617617
val res = Using.resources(
618618
group.newResource(),
619-
group.newResource(),
619+
group.newResource()
620620
) { (r1, r2) =>
621621
r1.identity(1) + r2.identity(1)
622622
}
@@ -630,7 +630,7 @@ class UsingTest {
630630
val res = Using.resources(
631631
group.newResource(),
632632
group.newResource(),
633-
group.newResource(),
633+
group.newResource()
634634
) { (r1, r2, r3) =>
635635
r1.identity(1) +
636636
r2.identity(1) +
@@ -647,7 +647,7 @@ class UsingTest {
647647
group.newResource(),
648648
group.newResource(),
649649
group.newResource(),
650-
group.newResource(),
650+
group.newResource()
651651
) { (r1, r2, r3, r4) =>
652652
r1.identity(1) +
653653
r2.identity(1) +
@@ -751,8 +751,8 @@ object UsingTest {
751751
final class UsingLinkageError(message: String) extends LinkageError(message)
752752
type ClosingInterruption = InterruptedException
753753
type UsingInterruption = ThreadDeath
754-
final class ClosingControl(message: String) extends ControlThrowable(message)
755-
final class UsingControl(message: String) extends ControlThrowable(message)
754+
final class ClosingControl(message: String) extends ControlThrowable
755+
final class UsingControl(message: String) extends ControlThrowable
756756
final class ClosingError(message: String) extends Error(message)
757757
final class UsingError(message: String) extends Error(message)
758758
final class ClosingException(message: String) extends Exception(message)

0 commit comments

Comments
 (0)