Skip to content

Commit e015c0c

Browse files
committed
Drop all uses of sealed on type parameters in tests
1 parent e4d15f2 commit e015c0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+268
-268
lines changed

tests/neg-custom-args/captures/capt-test.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def raise[E <: Exception](e: E): Nothing throws E = throw e
1414
def foo(x: Boolean): Int throws Fail =
1515
if x then 1 else raise(Fail())
1616

17-
def handle[E <: Exception, sealed R <: Top](op: (CT[E] @retains(caps.cap)) => R)(handler: E => R): R =
17+
def handle[E <: Exception, R <: Top](op: (CT[E] @retains(caps.cap)) => R)(handler: E => R): R =
1818
val x: CT[E] = ???
1919
try op(x)
2020
catch case ex: E => handler(ex)

tests/neg-custom-args/captures/heal-tparam-cs.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import language.experimental.captureChecking
22

33
trait Capp { def use(): Unit }
44

5-
def localCap[sealed T](op: (c: Capp^) => T): T = ???
5+
def localCap[T](op: (c: Capp^) => T): T = ???
66

77
def main(io: Capp^, net: Capp^): Unit = {
88

@@ -25,7 +25,7 @@ def main(io: Capp^, net: Capp^): Unit = {
2525
(c1: Capp^{io}) => () => { c1.use() }
2626
}
2727

28-
def localCap2[sealed T](op: (c: Capp^{io}) => T): T = ???
28+
def localCap2[T](op: (c: Capp^{io}) => T): T = ???
2929

3030
val test5: () ->{io} Unit =
3131
localCap2 { c => // ok

tests/neg-custom-args/captures/i15049.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ class Session:
22
def request = "Response"
33
class Foo:
44
private val session: Session^ = new Session
5-
def withSession[sealed T](f: Session^ => T): T = f(session)
5+
def withSession[T](f: Session^ => T): T = f(session)
66

77
def Test: Unit =
88
val f = new Foo

tests/neg-custom-args/captures/i15749a.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ def test =
1111
def wrapper[T](x: T): Wrapper[T] =
1212
[X] => (op: T ->{cap} X) => op(x)
1313

14-
def strictMap[A <: Top, sealed B <: Top](mx: Wrapper[A])(f: A ->{cap} B): Wrapper[B] =
14+
def strictMap[A <: Top, B <: Top](mx: Wrapper[A])(f: A ->{cap} B): Wrapper[B] =
1515
mx((x: A) => wrapper(f(x)))
1616

1717
def force[A](thunk: Unit ->{cap} A): A = thunk(u)
1818

19-
def forceWrapper[sealed A](mx: Wrapper[Unit ->{cap} A]): Wrapper[A] =
19+
def forceWrapper[A](mx: Wrapper[Unit ->{cap} A]): Wrapper[A] =
2020
// Γ ⊢ mx: Wrapper[□ {cap} Unit => A]
2121
// `force` should be typed as ∀(□ {cap} Unit -> A) A, but it can not
2222
strictMap[Unit ->{cap} A, A](mx)(t => force[A](t)) // error

tests/neg-custom-args/captures/leaking-iterators.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ end Iterator
3939
private final class ConcatIteratorCell[A](head: => IterableOnce[A]^):
4040
def headIterator: Iterator[A]^{this} = head.iterator
4141

42-
def usingLogFile[sealed R](op: FileOutputStream^ => R): R =
42+
def usingLogFile[R](op: FileOutputStream^ => R): R =
4343
val logFile = FileOutputStream("log")
4444
val result = op(logFile)
4545
logFile.close()

tests/neg-custom-args/captures/reaches.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
class File:
22
def write(): Unit = ???
33

4-
def usingFile[sealed T](f: File^ => T): T = ???
4+
def usingFile[T](f: File^ => T): T = ???
55

66
type Proc = () => Unit
77

8-
class Ref[sealed T](init: T):
8+
class Ref[T](init: T):
99
private var x: T = init
1010
def get: T = x
1111
def set(y: T) = { x = y }
@@ -45,7 +45,7 @@ def runAll3(xs: List[Proc]): Unit =
4545
next()
4646
cur.set(cur.get.tail: List[Proc])
4747

48-
class Id[sealed -A, sealed +B >: A]():
48+
class Id[-A, +B >: A]():
4949
def apply(a: A): B = a
5050

5151
def test =

tests/neg-custom-args/captures/recursive-leaking-local-cap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import language.experimental.captureChecking
22
trait Cap:
33
def use: Int = 42
44

5-
def usingCap[sealed T](op: Cap^ => T): T = ???
5+
def usingCap[T](op: Cap^ => T): T = ???
66

77
def badTest(): Unit =
88
def bad(b: Boolean)(c: Cap^): Cap^{c} =

tests/neg-custom-args/captures/simple-using.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import java.io.*
2-
def usingLogFile[sealed T](op: FileOutputStream^ => T): T =
2+
def usingLogFile[T](op: FileOutputStream^ => T): T =
33
val logFile = FileOutputStream("log")
44
val result = op(logFile)
55
logFile.close()

tests/neg-custom-args/captures/try.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def raise[E <: Exception](e: E): Nothing throws E = throw e
1414
def foo(x: Boolean): Int throws Fail =
1515
if x then 1 else raise(Fail())
1616

17-
def handle[E <: Exception, sealed R <: Top](op: CT[E]^ => R)(handler: E => R): R =
17+
def handle[E <: Exception, R <: Top](op: CT[E]^ => R)(handler: E => R): R =
1818
val x: CT[E] = ???
1919
try op(x)
2020
catch case ex: E => handler(ex)

tests/neg-custom-args/captures/usingFile.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object Test:
77
class Logger(f: OutputStream^):
88
def log(msg: String): Unit = ???
99

10-
def usingFile[sealed T](name: String, op: OutputStream^ => T): T =
10+
def usingFile[T](name: String, op: OutputStream^ => T): T =
1111
val f = new FileOutputStream(name)
1212
val result = op(f)
1313
f.close()

tests/neg-custom-args/captures/usingLogFile.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object Test1:
1414

1515
object Test2:
1616

17-
def usingLogFile[sealed T](op: FileOutputStream^ => T): T =
17+
def usingLogFile[T](op: FileOutputStream^ => T): T =
1818
val logFile = FileOutputStream("log")
1919
val result = op(logFile)
2020
logFile.close()
@@ -32,7 +32,7 @@ object Test3:
3232
class Logger(f: OutputStream^):
3333
def log(msg: String): Unit = ???
3434

35-
def usingFile[sealed T](name: String, op: OutputStream^ => T): T =
35+
def usingFile[T](name: String, op: OutputStream^ => T): T =
3636
val f = new FileOutputStream(name)
3737
val result = op(f)
3838
f.close()
@@ -44,7 +44,7 @@ object Test3:
4444
val later = usingFile("out", f => (y: Int) => xs.foreach(x => f.write(x + y))) // error
4545
later(1)
4646

47-
def usingLogger[sealed T](f: OutputStream^, op: Logger^{f} => T): T =
47+
def usingLogger[T](f: OutputStream^, op: Logger^{f} => T): T =
4848
val logger = Logger(f)
4949
op(logger)
5050

tests/neg-custom-args/captures/vars.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test(cap1: Cap, cap2: Cap) =
2929
val s = scope(new CC)
3030
val sc: String => String = scope(new CC)
3131

32-
def local[sealed T](op: CC^ -> T): T = op(CC())
32+
def local[T](op: CC^ -> T): T = op(CC())
3333

3434
local { cap3 => // error
3535
def g(x: String): String = if cap3 == cap3 then "" else "a"

tests/neg-custom-args/captures/withFile.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import java.io.*
22
object Test2:
33

4-
def usingLogFile[sealed T](op: FileOutputStream^ => T): T =
4+
def usingLogFile[T](op: FileOutputStream^ => T): T =
55
val logFile = FileOutputStream("log")
66
val result = op(logFile)
77
logFile.close()

tests/pos-custom-args/captures/buffers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import reflect.ClassTag
22

33
class Buffer[A]
44

5-
class ArrayBuffer[sealed A: ClassTag] extends Buffer[A]:
5+
class ArrayBuffer[A: ClassTag] extends Buffer[A]:
66
var elems: Array[A] = new Array[A](10)
77
def add(x: A): this.type = ???
88
def at(i: Int): A = ???
@@ -15,7 +15,7 @@ class ArrayBufferBAD[A: ClassTag] extends Buffer[A]:
1515
object ArrayBuffer:
1616
def make[A: ClassTag](xs: A*) = new ArrayBuffer:
1717
elems = xs.toArray
18-
def apply[sealed A: ClassTag](xs: A*) = new ArrayBuffer:
18+
def apply[A: ClassTag](xs: A*) = new ArrayBuffer:
1919
elems = xs.toArray // ok
2020

2121
class EncapsArray[A: ClassTag]:

tests/pos-custom-args/captures/reaches.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ def f(xs: List[C^]) =
55

66
type Proc = () => Unit
77

8-
class Ref[sealed T](init: T):
8+
class Ref[T](init: T):
99
private var x: T = init
1010
def get: T = x
1111
def set(y: T) = { x = y }

tests/pos-custom-args/captures/sealed-lowerbound.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
def foo[sealed B](x: B): B = x
1+
def foo[B](x: B): B = x
22

3-
def bar[B, sealed A >: B](x: A): A = foo[A](x)
3+
def bar[B, A >: B](x: A): A = foo[A](x)
44

5-
class C[sealed A]
5+
class C[A]
66

7-
class CV[sealed A](x: Int):
7+
class CV[A](x: Int):
88
def this() = this:
99
val x = new C[A]:
1010
println("foo")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
class Ops[sealed A](xs: Array[A]) extends AnyVal:
1+
class Ops[A](xs: Array[A]) extends AnyVal:
22

33
def f(p: A => Boolean): Array[A] = xs

tests/pos-custom-args/captures/steppers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ trait IterableOnce[+A] extends Any:
1111
this: IterableOnce[A]^ =>
1212
def stepper[S <: Stepper[_]^{this}](implicit shape: StepperShape[A, S]): S = ???
1313

14-
sealed abstract class ArraySeq[sealed T] extends IterableOnce[T], Pure:
14+
sealed abstract class ArraySeq[T] extends IterableOnce[T], Pure:
1515
def array: Array[_]
1616

1717
def sorted[B >: T](implicit ord: Ordering[B]): ArraySeq[T] =
@@ -20,7 +20,7 @@ sealed abstract class ArraySeq[sealed T] extends IterableOnce[T], Pure:
2020

2121
object ArraySeq:
2222

23-
def make[sealed T](x: Array[T]): ArraySeq[T] = ???
23+
def make[T](x: Array[T]): ArraySeq[T] = ???
2424

2525
final class ofRef[T <: AnyRef](val array: Array[T]) extends ArraySeq[T], Pure:
2626
override def stepper[S <: Stepper[_]](implicit shape: StepperShape[T, S]): S & Stepper.EfficientSplit = ???

tests/pos-custom-args/captures/test.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ type Cap = C^
33

44
type Proc = () => Unit
55

6-
class Ref[sealed T](p: T):
6+
class Ref[T](p: T):
77
private var x: T = p
88
def set(x: T): Unit = this.x = x
99
def get: T = x

tests/pos-special/stdlib/Test1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import java.io.*
66

77
object Test0:
88

9-
def usingLogFile[sealed T](op: FileOutputStream^ => T): T =
9+
def usingLogFile[T](op: FileOutputStream^ => T): T =
1010
val logFile = FileOutputStream("log")
1111
val result = op(logFile)
1212
logFile.close()

0 commit comments

Comments
 (0)