Skip to content

Commit 1db2afb

Browse files
committed
Change options line for tests/neg folder
1 parent da5d244 commit 1db2afb

File tree

8 files changed

+46
-46
lines changed

8 files changed

+46
-46
lines changed

tests/neg/i17612a.check

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
-- Error: tests/neg-custom-args/fatal-warnings/i17612a.scala:18:15 -----------------------------------------------------
1+
-- Error: tests/neg/i17612a.scala:18:15 --------------------------------------------------------------------------------
22
18 | class Derived(x : Int, y: Int, z2: Int) extends 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 class Base
5-
-- Error: tests/neg-custom-args/fatal-warnings/i17612a.scala:18:24 -----------------------------------------------------
5+
-- Error: tests/neg/i17612a.scala:18:24 --------------------------------------------------------------------------------
66
18 | class Derived(x : Int, y: Int, z2: Int) extends 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 class Base
9-
-- Error: tests/neg-custom-args/fatal-warnings/i17612a.scala:20:2 ------------------------------------------------------
9+
-- Error: tests/neg/i17612a.scala:20:2 ---------------------------------------------------------------------------------
1010
20 | 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 class Base
13-
-- Error: tests/neg-custom-args/fatal-warnings/i17612a.scala:21:2 ------------------------------------------------------
13+
-- Error: tests/neg/i17612a.scala:21:2 ---------------------------------------------------------------------------------
1414
21 | private[this] val shadowed3 = 3 + 3 // error
1515
| ^
1616
| value shadowed3 in class Derived shadows field shadowed3 inherited from class Base
17-
-- Error: tests/neg-custom-args/fatal-warnings/i17612a.scala:23:2 ------------------------------------------------------
17+
-- Error: tests/neg/i17612a.scala:23:2 ---------------------------------------------------------------------------------
1818
23 | private val shadowed5 = 5 + 5 // error
1919
| ^
2020
| value shadowed5 in class Derived shadows field shadowed5 inherited from class Base
21-
-- Error: tests/neg-custom-args/fatal-warnings/i17612a.scala:34:20 -----------------------------------------------------
21+
-- Error: tests/neg/i17612a.scala:34:20 --------------------------------------------------------------------------------
2222
34 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, y, z) // error // error // error
2323
| ^
2424
| value x in class UnderDerived shadows field x inherited from class Base
25-
-- Error: tests/neg-custom-args/fatal-warnings/i17612a.scala:34:28 -----------------------------------------------------
25+
-- Error: tests/neg/i17612a.scala:34:28 --------------------------------------------------------------------------------
2626
34 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, y, z) // error // error // error
2727
| ^
2828
| value y in class UnderDerived shadows field y inherited from class Base
29-
-- Error: tests/neg-custom-args/fatal-warnings/i17612a.scala:34:36 -----------------------------------------------------
29+
-- Error: tests/neg/i17612a.scala:34:36 --------------------------------------------------------------------------------
3030
34 | class UnderDerived(x: Int, y: Int, z: Int) extends Derived(x, y, z) // error // error // error
3131
| ^
3232
| value z in class UnderDerived shadows field z inherited from class Base

tests/neg/i17612a.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// scalac: -Xlint:private-shadow
1+
//> using options -Xfatal-warnings -Xlint:private-shadow
22

33
object i17612a:
44
class Base(var x: Int, val y: Int, var z: Int):

tests/neg/i17612b.check

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
-- Error: tests/neg-custom-args/fatal-warnings/i17612b/i17612b.scala:21:15 ---------------------------------------------
1+
-- Error: tests/neg/i17612b/i17612b.scala:21:15 ------------------------------------------------------------------------
22
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-
-- Error: tests/neg-custom-args/fatal-warnings/i17612b/i17612b.scala:21:33 ---------------------------------------------
5+
-- Error: tests/neg/i17612b/i17612b.scala:21:33 ------------------------------------------------------------------------
66
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-
-- Error: tests/neg-custom-args/fatal-warnings/i17612b/i17612b.scala:23:2 ----------------------------------------------
9+
-- Error: tests/neg/i17612b/i17612b.scala:23:2 -------------------------------------------------------------------------
1010
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-
-- Error: tests/neg-custom-args/fatal-warnings/i17612b/i17612b.scala:24:2 ----------------------------------------------
13+
-- Error: tests/neg/i17612b/i17612b.scala:24:2 -------------------------------------------------------------------------
1414
24 | private[this] val shadowed3 = 3 + 3 // error
1515
| ^
1616
| value shadowed3 in class Derived shadows field shadowed3 inherited from trait Base
17-
-- Error: tests/neg-custom-args/fatal-warnings/i17612b/i17612b.scala:26:2 ----------------------------------------------
17+
-- Error: tests/neg/i17612b/i17612b.scala:26:2 -------------------------------------------------------------------------
1818
26 | private val shadowed5 = 5 + 5 // error
1919
| ^
2020
| value shadowed5 in class Derived shadows field shadowed5 inherited from trait Base
21-
-- Error: tests/neg-custom-args/fatal-warnings/i17612b/i17612b.scala:41:20 ---------------------------------------------
21+
-- Error: tests/neg/i17612b/i17612b.scala:41:20 ------------------------------------------------------------------------
2222
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-
-- Error: tests/neg-custom-args/fatal-warnings/i17612b/i17612b.scala:41:28 ---------------------------------------------
25+
-- Error: tests/neg/i17612b/i17612b.scala:41:28 ------------------------------------------------------------------------
2626
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-
-- Error: tests/neg-custom-args/fatal-warnings/i17612b/i17612b.scala:41:36 ---------------------------------------------
29+
-- Error: tests/neg/i17612b/i17612b.scala:41:36 ------------------------------------------------------------------------
3030
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

tests/neg/i17612b/i17612b.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// scalac: -Xlint:private-shadow
1+
//> using options -Xfatal-warnings -Xlint:private-shadow
22

33
object i17612b:
44

tests/neg/i17613a.check

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
-- Error: tests/neg-custom-args/fatal-warnings/i17613a.scala:8:13 ------------------------------------------------------
1+
-- Error: tests/neg/i17613a.scala:8:13 ---------------------------------------------------------------------------------
22
8 | def foobar[D](in: D) = in.toString // error method parameter shadows some other type
33
| ^
44
| Type parameter D for method foobar shadows the type defined by trait D in class B
5-
-- Error: tests/neg-custom-args/fatal-warnings/i17613a.scala:9:13 ------------------------------------------------------
5+
-- Error: tests/neg/i17613a.scala:9:13 ---------------------------------------------------------------------------------
66
9 | type MySeq[D] = Seq[D] // error type member's parameter shadows some other type
77
| ^
88
| Type parameter D for type MySeq shadows the type defined by trait D in class B
9-
-- Error: tests/neg-custom-args/fatal-warnings/i17613a.scala:11:12 -----------------------------------------------------
9+
-- Error: tests/neg/i17613a.scala:11:12 --------------------------------------------------------------------------------
1010
11 | class Foo[T](t: T): // error class parameter shadows some other type
1111
| ^
1212
| Type parameter T for class Foo shadows the type defined by type T in class B
13-
-- Error: tests/neg-custom-args/fatal-warnings/i17613a.scala:12:11 -----------------------------------------------------
13+
-- Error: tests/neg/i17613a.scala:12:11 --------------------------------------------------------------------------------
1414
12 | def bar[T](w: T) = w.toString // error a type parameter shadows another type parameter
1515
| ^
1616
| Type parameter T for method bar shadows the type defined by type T in class Foo
17-
-- Error: tests/neg-custom-args/fatal-warnings/i17613a.scala:15:12 -----------------------------------------------------
17+
-- Error: tests/neg/i17613a.scala:15:12 --------------------------------------------------------------------------------
1818
15 | class C[M[List[_]]] // error
1919
| ^^^^^^^
2020
| Type parameter List for class C shadows the type defined by type List in package scala
21-
-- Error: tests/neg-custom-args/fatal-warnings/i17613a.scala:16:11 -----------------------------------------------------
21+
-- Error: tests/neg/i17613a.scala:16:11 --------------------------------------------------------------------------------
2222
16 | type E[M[List[_]]] = Int // error
2323
| ^^^^^^^
2424
| Type parameter List for type E shadows the type defined by type List in package scala
25-
-- Error: tests/neg-custom-args/fatal-warnings/i17613a.scala:17:14 -----------------------------------------------------
25+
-- Error: tests/neg/i17613a.scala:17:14 --------------------------------------------------------------------------------
2626
17 | def foo[N[M[List[_]]]] = ??? // error
2727
| ^^^^^^^
2828
| Type parameter List for method foo shadows the type defined by type List in package scala

tests/neg/i17613a.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
// scalac: -Xlint:type-parameter-shadow
1+
//> using options -Xfatal-warnings -Xlint:type-parameter-shadow
22

33
object i17613a:
44
class B:
55
type T = Int
66
trait D
7-
7+
88
def foobar[D](in: D) = in.toString // error method parameter shadows some other type
99
type MySeq[D] = Seq[D] // error type member's parameter shadows some other type
10-
10+
1111
class Foo[T](t: T): // error class parameter shadows some other type
1212
def bar[T](w: T) = w.toString // error a type parameter shadows another type parameter
13-
13+
1414
// even deeply nested...
1515
class C[M[List[_]]] // error
1616
type E[M[List[_]]] = Int // error
1717
def foo[N[M[List[_]]]] = ??? // error
1818

1919
// ...but not between type parameters in the same list
20-
class F[A, M[N[A]]]
20+
class F[A, M[N[A]]]
2121
type G[A, M[L[A]]] = Int
2222
def bar[A, N[M[L[A]]]] = ???
2323
def main(args: Array[String]) = println("Test for type parameter shadow")

tests/neg/i17613b.check

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:9:13 ----------------------------------------------
1+
-- Error: tests/neg/i17613b/i17613b.scala:9:13 -------------------------------------------------------------------------
22
9 | def foobar[ImTrait](in: D) = in.toString // error
33
| ^^^^^^^
44
| Type parameter ImTrait for method foobar shadows the type defined by trait ImTrait in object importTry
5-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:10:13 ---------------------------------------------
5+
-- Error: tests/neg/i17613b/i17613b.scala:10:13 ------------------------------------------------------------------------
66
10 | type MySeq[ImTrait] = Seq[D] // error
77
| ^^^^^^^
88
| Type parameter ImTrait for type MySeq shadows the type defined by trait ImTrait in object importTry
9-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:12:14 ---------------------------------------------
9+
-- Error: tests/neg/i17613b/i17613b.scala:12:14 ------------------------------------------------------------------------
1010
12 | def foobar2[ImClass](in: D) = in.toString // error
1111
| ^^^^^^^
1212
| Type parameter ImClass for method foobar2 shadows the type defined by class ImClass in object importTry
13-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:13:14 ---------------------------------------------
13+
-- Error: tests/neg/i17613b/i17613b.scala:13:14 ------------------------------------------------------------------------
1414
13 | type MySeq2[ImClass] = Seq[D] // error
1515
| ^^^^^^^
1616
| Type parameter ImClass for type MySeq2 shadows the type defined by class ImClass in object importTry
17-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:16:24 ---------------------------------------------
17+
-- Error: tests/neg/i17613b/i17613b.scala:16:24 ------------------------------------------------------------------------
1818
16 | type TypeLambda[A] = [ImTrait] =>> Map[ImTrait, B] // error
1919
| ^^^^^^^
2020
| Type parameter ImTrait for type TypeLambda shadows the type defined by trait ImTrait in object importTry
21-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:17:21 ---------------------------------------------
21+
-- Error: tests/neg/i17613b/i17613b.scala:17:21 ------------------------------------------------------------------------
2222
17 | type PolyFun[A] = [ImTrait] => ImTrait => B // error
2323
| ^^^^^^^
2424
| Type parameter ImTrait for type PolyFun shadows the type defined by trait ImTrait in object importTry
25-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:23:12 ---------------------------------------------
25+
-- Error: tests/neg/i17613b/i17613b.scala:23:12 ------------------------------------------------------------------------
2626
23 | class Foo[T](t: T): // error class parameter shadows some other type
2727
| ^
2828
| Type parameter T for class Foo shadows the type defined by type T in class B
29-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:27:15 ---------------------------------------------
29+
-- Error: tests/neg/i17613b/i17613b.scala:27:15 ------------------------------------------------------------------------
3030
27 | def intType[List1](x: T) = x.toString() // error
3131
| ^^^^^
3232
| Type parameter List1 for method intType shadows an explicitly renamed type : List1
33-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:32:10 ---------------------------------------------
33+
-- Error: tests/neg/i17613b/i17613b.scala:32:10 ------------------------------------------------------------------------
3434
32 | given [Int]: Ordering[Int]() // error
3535
| ^^^
3636
| Type parameter Int for method given_Ordering_Int shadows the type defined by class Int in package scala
37-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:34:12 ---------------------------------------------
37+
-- Error: tests/neg/i17613b/i17613b.scala:34:12 ------------------------------------------------------------------------
3838
34 | class C[M[List[_]]] // error List not renamed here
3939
| ^^^^^^^
4040
| Type parameter List for class C shadows the type defined by type List in package scala
41-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:35:11 ---------------------------------------------
41+
-- Error: tests/neg/i17613b/i17613b.scala:35:11 ------------------------------------------------------------------------
4242
35 | type E[M[Int[_]]] = Int // error
4343
| ^^^^^^
4444
| Type parameter Int for type E shadows the type defined by class Int in package scala
45-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:37:14 ---------------------------------------------
45+
-- Error: tests/neg/i17613b/i17613b.scala:37:14 ------------------------------------------------------------------------
4646
37 | def foo[N[M[List[_]]]] = // error
4747
| ^^^^^^^
4848
| Type parameter List for method foo shadows the type defined by type List in package scala
49-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:40:11 ---------------------------------------------
49+
-- Error: tests/neg/i17613b/i17613b.scala:40:11 ------------------------------------------------------------------------
5050
40 | type Z[ImClassR] = Int // error
5151
| ^^^^^^^^
5252
| Type parameter ImClassR for type Z shadows an explicitly renamed type : ImClassR
53-
-- Error: tests/neg-custom-args/fatal-warnings/i17613b/i17613b.scala:41:18 ---------------------------------------------
53+
-- Error: tests/neg/i17613b/i17613b.scala:41:18 ------------------------------------------------------------------------
5454
41 | class InnerCl[ImClassR] // error
5555
| ^^^^^^^^
5656
| Type parameter ImClassR for class InnerCl shadows an explicitly renamed type : ImClassR

tests/neg/i17613b/i17613b.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// scalac: -Xlint:type-parameter-shadow
1+
//> using options -Xfatal-warnings -Xlint:type-parameter-shadow
22

33
object i17613b:
44
import importTry._
@@ -41,4 +41,4 @@ object i17613b:
4141
class InnerCl[ImClassR] // error
4242
5
4343

44-
def main(args: Array[String]) = println("Test for type parameter shadow")
44+
def main(args: Array[String]) = println("Test for type parameter shadow")

0 commit comments

Comments
 (0)