Skip to content

Commit 1fa2015

Browse files
szymon-rdszymon-rd
committed
Fix tests with changed out
1 parent 6b03348 commit 1fa2015

File tree

4 files changed

+51
-56
lines changed

4 files changed

+51
-56
lines changed

‎tests/neg/i17612b.check

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
1-
-- Warning: tests/neg/i17612b/i17612b.scala:21:15 ----------------------------------------------------------------------
2-
21 | class Derived(x : Int, x3: Int, y: Int, z2: Int) extends BaseB, BaseC(x3), Base(x, y + 1, z2): // warn // warn / for x, y translated to private[this] x field & shadowing var Base.x, Base.y
1+
-- Error: tests/neg/i17612b/i17612b.scala:21:15 ------------------------------------------------------------------------
2+
21 | class Derived(x : Int, x3: Int, y: Int, z2: Int) extends BaseB, BaseC(x3), Base(x, y + 1, z2): // error // error / for x, y translated to private[this] x field & shadowing var Base.x, Base.y
33
| ^
44
| value x in class Derived shadows field x inherited from trait Base
5-
-- Warning: tests/neg/i17612b/i17612b.scala:21:33 ----------------------------------------------------------------------
6-
21 | class Derived(x : Int, x3: Int, y: Int, z2: Int) extends BaseB, BaseC(x3), Base(x, y + 1, z2): // warn // warn / for x, y translated to private[this] x field & shadowing var Base.x, Base.y
5+
-- Error: tests/neg/i17612b/i17612b.scala:21:33 ------------------------------------------------------------------------
6+
21 | class Derived(x : Int, x3: Int, y: Int, z2: Int) extends BaseB, BaseC(x3), Base(x, y + 1, z2): // error // error / for x, y translated to private[this] x field & shadowing var Base.x, Base.y
77
| ^
88
| value y in class Derived shadows field y inherited from trait Base
9-
-- Warning: tests/neg/i17612b/i17612b.scala:23:2 -----------------------------------------------------------------------
10-
23 | private val shadowed2 = 2 + 2 // warn (In Scala 2 we cannot do that got the warning)
9+
-- Error: tests/neg/i17612b/i17612b.scala:23:2 -------------------------------------------------------------------------
10+
23 | private val shadowed2 = 2 + 2 // error (In Scala 2 we cannot do that got the warning)
1111
| ^
1212
| value shadowed2 in class Derived shadows field shadowed2 inherited from trait Base
13-
-- Warning: tests/neg/i17612b/i17612b.scala:24:2 -----------------------------------------------------------------------
14-
24 | private[this] val shadowed3 = 3 + 3 // warn
13+
-- Error: tests/neg/i17612b/i17612b.scala:24:2 -------------------------------------------------------------------------
14+
24 | private[this] val shadowed3 = 3 + 3 // error
1515
| ^
1616
| value shadowed3 in class Derived shadows field shadowed3 inherited from trait Base
17-
-- Warning: tests/neg/i17612b/i17612b.scala:26:2 -----------------------------------------------------------------------
18-
26 | private val shadowed5 = 5 + 5 // warn
17+
-- Error: tests/neg/i17612b/i17612b.scala:26:2 -------------------------------------------------------------------------
18+
26 | private val shadowed5 = 5 + 5 // error
1919
| ^
2020
| value shadowed5 in class Derived shadows field shadowed5 inherited from trait Base
21-
-- Warning: tests/neg/i17612b/i17612b.scala:41:20 ----------------------------------------------------------------------
22-
41 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, 1, y, z) // warn // warn // warn
21+
-- Error: tests/neg/i17612b/i17612b.scala:41:20 ------------------------------------------------------------------------
22+
41 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, 1, y, z) // error // error // error
2323
| ^
2424
| value x in class UnderDerived shadows field x inherited from trait Base
25-
-- Warning: tests/neg/i17612b/i17612b.scala:41:28 ----------------------------------------------------------------------
26-
41 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, 1, y, z) // warn // warn // warn
25+
-- Error: tests/neg/i17612b/i17612b.scala:41:28 ------------------------------------------------------------------------
26+
41 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, 1, y, z) // error // error // error
2727
| ^
2828
| value y in class UnderDerived shadows field y inherited from trait Base
29-
-- Warning: tests/neg/i17612b/i17612b.scala:41:36 ----------------------------------------------------------------------
30-
41 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, 1, y, z) // warn // warn // warn
29+
-- Error: tests/neg/i17612b/i17612b.scala:41:36 ------------------------------------------------------------------------
30+
41 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, 1, y, z) // error // error // error
3131
| ^
3232
| value z in class UnderDerived shadows field z inherited from trait Base
33-
No warnings can be incurred under -Werror.

‎tests/neg/i17613b.check

Lines changed: 31 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,56 @@
1-
-- Warning: tests/neg/i17613b/i17613b.scala:7:18 -----------------------------------------------------------------------
2-
7 | trait Typeclass[T]
3-
| ^
4-
| Type parameter T for trait Typeclass shadows the type defined by type T in class B
5-
-- Warning: tests/neg/i17613b/i17613b.scala:10:13 ----------------------------------------------------------------------
6-
10 | def foobar[ImTrait](in: D) = in.toString // warn
7-
| ^^^^^^^
8-
| Type parameter ImTrait for method foobar shadows the type defined by trait ImTrait in object importTry
9-
-- Warning: tests/neg/i17613b/i17613b.scala:11:13 ----------------------------------------------------------------------
10-
11 | type MySeq[ImTrait] = Seq[D] // warn
1+
-- Error: tests/neg/i17613b/i17613b.scala:9:13 -------------------------------------------------------------------------
2+
9 | def foobar[ImTrait](in: D) = in.toString // error
3+
| ^^^^^^^
4+
| Type parameter ImTrait for method foobar shadows the type defined by trait ImTrait in object importTry
5+
-- Error: tests/neg/i17613b/i17613b.scala:10:13 ------------------------------------------------------------------------
6+
10 | type MySeq[ImTrait] = Seq[D] // error
117
| ^^^^^^^
128
| Type parameter ImTrait for type MySeq shadows the type defined by trait ImTrait in object importTry
13-
-- Warning: tests/neg/i17613b/i17613b.scala:13:14 ----------------------------------------------------------------------
14-
13 | def foobar2[ImClass](in: D) = in.toString // warn
9+
-- Error: tests/neg/i17613b/i17613b.scala:12:14 ------------------------------------------------------------------------
10+
12 | def foobar2[ImClass](in: D) = in.toString // error
1511
| ^^^^^^^
1612
| Type parameter ImClass for method foobar2 shadows the type defined by class ImClass in object importTry
17-
-- Warning: tests/neg/i17613b/i17613b.scala:14:14 ----------------------------------------------------------------------
18-
14 | type MySeq2[ImClass] = Seq[D] // warn
13+
-- Error: tests/neg/i17613b/i17613b.scala:13:14 ------------------------------------------------------------------------
14+
13 | type MySeq2[ImClass] = Seq[D] // error
1915
| ^^^^^^^
2016
| Type parameter ImClass for type MySeq2 shadows the type defined by class ImClass in object importTry
21-
-- Warning: tests/neg/i17613b/i17613b.scala:17:24 ----------------------------------------------------------------------
22-
17 | type TypeLambda[A] = [ImTrait] =>> Map[ImTrait, B]
17+
-- Error: tests/neg/i17613b/i17613b.scala:16:24 ------------------------------------------------------------------------
18+
16 | type TypeLambda[A] = [ImTrait] =>> Map[ImTrait, B] // error
2319
| ^^^^^^^
2420
| Type parameter ImTrait for type TypeLambda shadows the type defined by trait ImTrait in object importTry
25-
-- Warning: tests/neg/i17613b/i17613b.scala:18:21 ----------------------------------------------------------------------
26-
18 | type PolyFun[A] = [ImTrait] => ImTrait => B // warn
21+
-- Error: tests/neg/i17613b/i17613b.scala:17:21 ------------------------------------------------------------------------
22+
17 | type PolyFun[A] = [ImTrait] => ImTrait => B // error
2723
| ^^^^^^^
2824
| Type parameter ImTrait for type PolyFun shadows the type defined by trait ImTrait in object importTry
29-
-- Warning: tests/neg/i17613b/i17613b.scala:24:12 ----------------------------------------------------------------------
30-
24 | class Foo[T](t: T): // warn class parameter shadows some other type
25+
-- Error: tests/neg/i17613b/i17613b.scala:23:12 ------------------------------------------------------------------------
26+
23 | class Foo[T](t: T): // error class parameter shadows some other type
3127
| ^
3228
| Type parameter T for class Foo shadows the type defined by type T in class B
33-
-- Warning: tests/neg/i17613b/i17613b.scala:28:15 ----------------------------------------------------------------------
34-
28 | def intType[List1](x: T) = x.toString() // warn
29+
-- Error: tests/neg/i17613b/i17613b.scala:27:15 ------------------------------------------------------------------------
30+
27 | def intType[List1](x: T) = x.toString() // error
3531
| ^^^^^
3632
| Type parameter List1 for method intType shadows an explicitly renamed type : List1
37-
-- Warning: tests/neg/i17613b/i17613b.scala:33:10 ----------------------------------------------------------------------
38-
33 | given [Int]: Typeclass[Int]() // warn
33+
-- Error: tests/neg/i17613b/i17613b.scala:32:10 ------------------------------------------------------------------------
34+
32 | given [Int]: Ordering[Int]() // error
3935
| ^^^
40-
| Type parameter Int for method given_Typeclass_Int shadows the type defined by class Int in package scala
41-
-- Warning: tests/neg/i17613b/i17613b.scala:35:12 ----------------------------------------------------------------------
42-
35 | class C[M[List[_]]] // warn List not renamed here
36+
| Type parameter Int for method given_Ordering_Int shadows the type defined by class Int in package scala
37+
-- Error: tests/neg/i17613b/i17613b.scala:34:12 ------------------------------------------------------------------------
38+
34 | class C[M[List[_]]] // error List not renamed here
4339
| ^^^^^^^
4440
| Type parameter List for class C shadows the type defined by type List in package scala
45-
-- Warning: tests/neg/i17613b/i17613b.scala:36:11 ----------------------------------------------------------------------
46-
36 | type E[M[Int[_]]] = Int // warn
41+
-- Error: tests/neg/i17613b/i17613b.scala:35:11 ------------------------------------------------------------------------
42+
35 | type E[M[Int[_]]] = Int // error
4743
| ^^^^^^
4844
| Type parameter Int for type E shadows the type defined by class Int in package scala
49-
-- Warning: tests/neg/i17613b/i17613b.scala:38:14 ----------------------------------------------------------------------
50-
38 | def foo[N[M[List[_]]]] = // warn
45+
-- Error: tests/neg/i17613b/i17613b.scala:37:14 ------------------------------------------------------------------------
46+
37 | def foo[N[M[List[_]]]] = // error
5147
| ^^^^^^^
5248
| Type parameter List for method foo shadows the type defined by type List in package scala
53-
-- Warning: tests/neg/i17613b/i17613b.scala:41:11 ----------------------------------------------------------------------
54-
41 | type Z[ImClassR] = Int // warn
49+
-- Error: tests/neg/i17613b/i17613b.scala:40:11 ------------------------------------------------------------------------
50+
40 | type Z[ImClassR] = Int // error
5551
| ^^^^^^^^
5652
| Type parameter ImClassR for type Z shadows an explicitly renamed type : ImClassR
57-
-- Warning: tests/neg/i17613b/i17613b.scala:42:18 ----------------------------------------------------------------------
58-
42 | class InnerCl[ImClassR] // warn
53+
-- Error: tests/neg/i17613b/i17613b.scala:41:18 ------------------------------------------------------------------------
54+
41 | class InnerCl[ImClassR] // error
5955
| ^^^^^^^^
6056
| Type parameter ImClassR for class InnerCl shadows an explicitly renamed type : ImClassR
61-
No warnings can be incurred under -Werror.

‎tests/neg/i9408b.check

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

2-
-- Migration Warning: tests/neg/i9408b/Test_2.scala:8:20 ---------------------------------------------------------------
3-
8 | val length: Int = "abc" // warn
2+
-- Error: tests/neg/i9408b/Test_2.scala:8:20 ---------------------------------------------------------------------------
3+
8 | val length: Int = "abc" // error
44
| ^^^^^
55
|The conversion (test.conversions.Conv.implicitLength : String => Int) will not be applied implicitly here in Scala 3 because only implicit methods and instances of Conversion class will continue to work as implicit views.
6-
No warnings can be incurred under -Werror.

‎tests/warn/i13440.check

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
5 |def given = 42 // warn
33
| ^
44
| given is now a keyword, write `given` instead of given to keep it as an identifier
5+
| This can be rewritten automatically under -rewrite -source 3.0-migration.
56
-- Migration Warning: tests/warn/i13440.scala:7:13 ---------------------------------------------------------------------
67
7 |case class C(enum: List[Int] = Nil) { // warn
78
| ^
89
| enum is now a keyword, write `enum` instead of enum to keep it as an identifier
10+
| This can be rewritten automatically under -rewrite -source 3.0-migration.
911
-- Migration Warning: tests/warn/i13440.scala:8:11 ---------------------------------------------------------------------
1012
8 | val s = s"$enum" // warn
1113
| ^

0 commit comments

Comments
 (0)