Skip to content

Commit 95d394a

Browse files
committed
Fix CI
1 parent 53a3d4a commit 95d394a

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

tests/neg-strict/filtering-fors.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Test {
22

3-
val xs: List[Any] = ???
3+
val xs: List[AnyRef] = ???
44

55
for (x <- xs) do () // OK
66
for (x: Any <- xs) do () // OK
@@ -16,7 +16,7 @@ object Test {
1616
for (case (x: String) <- xs; (y, z) <- xs) do () // error
1717
for ((x: String) <- xs; case (y, z) <- xs) do () // error
1818

19-
val pairs: List[Any] = List((1, 2), "hello", (3, 4))
19+
val pairs: List[AnyRef] = List((1, 2), "hello", (3, 4))
2020
for ((x, y) <- pairs) yield (y, x) // error
2121

2222
for (case x: String <- xs) do () // OK

tests/neg-strict/i1050.scala

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -95,35 +95,35 @@ object Tiark6 {
9595
}
9696

9797
object Indirect {
98-
trait B { type L >: Any }
99-
trait A { type L <: Nothing }
100-
trait U {
101-
trait X {
102-
val q: A & B = ???
103-
type M = q.L
104-
}
105-
final lazy val p: X = ???
106-
def brand(x: Any): p.M = x // error: conflicting bounds
98+
trait B { type L >: Any }
99+
trait A { type L <: Nothing }
100+
trait U {
101+
trait X {
102+
val q: A & B = ???
103+
type M = q.L
107104
}
105+
final lazy val p: X = ???
106+
def brand(x: Any): p.M = x // error: conflicting bounds
107+
}
108108
def main(args: Array[String]): Unit = {
109109
val v = new U {}
110110
v.brand("boom!"): Nothing
111111
}
112112
}
113113
object Indirect2 {
114-
trait B { type L >: Any }
115-
trait A { type L <: Nothing }
116-
trait U {
117-
trait Y {
118-
val r: A & B = ???
119-
}
120-
trait X {
121-
val q: Y = ???
122-
type M = q.r.L
123-
}
124-
final lazy val p: X = ???
125-
def brand(x: Any): p.M = x // error: conflicting bounds
114+
trait B { type L >: Any }
115+
trait A { type L <: Nothing }
116+
trait U {
117+
trait Y {
118+
val r: A & B = ???
119+
}
120+
trait X {
121+
val q: Y = ???
122+
type M = q.r.L
126123
}
124+
final lazy val p: X = ???
125+
def brand(x: Any): p.M = x // error: conflicting bounds
126+
}
127127
def main(args: Array[String]): Unit = {
128128
val v = new U {}
129129
v.brand("boom!"): Nothing
@@ -144,38 +144,38 @@ object Rec1 {
144144
}
145145
}
146146
object Rec2 {
147-
trait B { type L >: Any }
148-
trait A { type L <: Nothing }
149-
trait U {
150-
trait Y {
151-
val r: A & B & Y
152-
}
153-
trait X {
154-
val q: Y = ???
155-
type M = q.r.L
156-
}
157-
final lazy val p: X = ???
158-
def brand(x: Any): p.M = x // error: conflicting bounds
147+
trait B { type L >: Any }
148+
trait A { type L <: Nothing }
149+
trait U {
150+
trait Y {
151+
val r: A & B & Y
152+
}
153+
trait X {
154+
val q: Y = ???
155+
type M = q.r.L
159156
}
157+
final lazy val p: X = ???
158+
def brand(x: Any): p.M = x // error: conflicting bounds
159+
}
160160
def main(args: Array[String]): Unit = {
161161
val v = new U {}
162162
v.brand("boom!"): Nothing
163163
}
164164
}
165165
object Indirect3 {
166-
trait B { type L >: Any }
167-
trait A { type L <: Nothing }
168-
trait U {
169-
trait Y {
170-
val r: Y & A & B = ???
171-
}
172-
trait X {
173-
val q: Y = ???
174-
type M = q.r.L
175-
}
176-
final lazy val p: X = ???
177-
def brand(x: Any): p.M = x // error: conflicting bounds
166+
trait B { type L >: Any }
167+
trait A { type L <: Nothing }
168+
trait U {
169+
trait Y {
170+
val r: Y & A & B = ???
178171
}
172+
trait X {
173+
val q: Y = ???
174+
type M = q.r.L
175+
}
176+
final lazy val p: X = ???
177+
def brand(x: Any): p.M = x // error: conflicting bounds
178+
}
179179
def main(args: Array[String]): Unit = {
180180
val v = new U {}
181181
v.brand("boom!"): Nothing

0 commit comments

Comments
 (0)