Skip to content

Commit 48d6a5e

Browse files
committed
Workaround more precise type patterns in scalac: scala/scala3#3208
1 parent 332f83f commit 48d6a5e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

scalatest/src/main/scala/org/scalatest/AppendedClues.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ trait AppendedClues {
158158
}
159159
}
160160
catch {
161-
case e: ModifiableMessage[_] =>
161+
case e: ModifiableMessage[_] with Throwable =>
162162
if (clue.toString != "")
163163
throw e.modifyMessage(append)
164164
else

scalatest/src/main/scala/org/scalatest/Assertions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ trait Assertions extends TripleEquals {
11711171
}
11721172
}
11731173
catch {
1174-
case e: org.scalatest.exceptions.ModifiableMessage[_] =>
1174+
case e: org.scalatest.exceptions.ModifiableMessage[_] with Throwable =>
11751175
if (clue != "")
11761176
throw e.modifyMessage(prepend)
11771177
else

scalatest/src/main/scala/org/scalatest/Checkpoints.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ trait Checkpoints {
136136
case e: TestRegistrationClosedException => throw e
137137
case e: NotAllowedException => throw e
138138
case e: DuplicateTestNameException => throw e
139-
case e: StackDepth => failures.add(e)
139+
case e: StackDepth with Throwable => failures.add(e)
140140
case e: Throwable => throw e
141141
}
142142
}

scalatest/src/main/scala/org/scalatest/Payloads.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ trait Payloads {
7575
}
7676
}
7777
catch {
78-
case e: org.scalatest.exceptions.ModifiablePayload[_] =>
78+
case e: org.scalatest.exceptions.ModifiablePayload[_] with Throwable =>
7979
if (payload != null)
8080
throw e.modifyPayload((currentPayload: Option[Any]) => Some(payload))
8181
else

0 commit comments

Comments
 (0)