File tree 3 files changed +6
-5
lines changed
main/scala/scala/async/internal
test/scala/scala/async/run/futures
3 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ scalaModuleSettings
4
4
5
5
scalaVersionsByJvm in ThisBuild := {
6
6
val v212 = " 2.12.6"
7
- val v213 = " 2.13.0-M3 "
7
+ val v213 = " 2.13.0-M5 "
8
8
9
9
val allFalse = List (v212 -> false , v213 -> false )
10
10
Map (
Original file line number Diff line number Diff line change @@ -185,7 +185,7 @@ trait LiveVariables {
185
185
*/
186
186
187
187
var LVentry = IntMap [Set [Symbol ]]() withDefaultValue Set [Symbol ]()
188
- var LVexit = IntMap [Set [Symbol ]]() withDefaultValue Set [Symbol ]()
188
+ var LVexit : Map [ Int , Set [ Symbol ]] = IntMap [Set [Symbol ]]() withDefaultValue Set [Symbol ]()
189
189
190
190
// All fields are declared to be dead at the exit of the final async state, except for the ones
191
191
// that cannot be nulled out at all (those in noNull), because they have been captured by a nested def.
Original file line number Diff line number Diff line change @@ -6,8 +6,9 @@ package scala.async
6
6
package run
7
7
package futures
8
8
9
- import scala . language . postfixOps
9
+ import java . util . concurrent . ConcurrentHashMap
10
10
11
+ import scala .language .postfixOps
11
12
import scala .concurrent ._
12
13
import scala .concurrent .duration ._
13
14
import scala .concurrent .duration .Duration .Inf
@@ -34,10 +35,10 @@ class FutureSpec {
34
35
/* future specification */
35
36
36
37
@ Test def `A future with custom ExecutionContext should handle Throwables` (): Unit = {
37
- val ms = new mutable. HashSet [Throwable ] with mutable. SynchronizedSet [ Throwable ]
38
+ val ms = new ConcurrentHashMap [Throwable , Unit ]
38
39
implicit val ec = scala.concurrent.ExecutionContext .fromExecutor(new java.util.concurrent.ForkJoinPool (), {
39
40
t =>
40
- ms += t
41
+ ms.put(t, ())
41
42
})
42
43
43
44
class ThrowableTest (m : String ) extends Throwable (m)
You can’t perform that action at this time.
0 commit comments