Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b99c1f9

Browse files
Peng Chengtribbloid
authored andcommitted
upgrade relevant test fixtures to be on par with splain 1.0.0
1 parent bfedc2b commit b99c1f9

File tree

3 files changed

+59
-7
lines changed

3 files changed

+59
-7
lines changed

test/files/run/splain-tree.check

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ i1a invalid because
1616
!I p: tpes.I8
1717
――――――――――――――i8 invalid because
1818
!I p: tpes.I9
19-
2019
――――――――――i6b invalid because
2120
!I p: tpes.I8
2221
――――――――――――i8 invalid because
2322
!I p: tpes.I9
24-
2523
――――i3b invalid because
2624
!I p: tpes.I4
2725
――――――i4 invalid because
@@ -34,7 +32,10 @@ i1a invalid because
3432
!I p: tpes.I8
3533
――――――――――――――i8 invalid because
3634
!I p: tpes.I9
37-
35+
――――――――――i6b invalid because
36+
!I p: tpes.I8
37+
――――――――――――i8 invalid because
38+
!I p: tpes.I9
3839
i1b invalid because
3940
!I p: tpes.I6
4041
――i6a invalid because
@@ -43,5 +44,51 @@ i1b invalid because
4344
!I p: tpes.I8
4445
――――――i8 invalid because
4546
!I p: tpes.I9
47+
――i6b invalid because
48+
!I p: tpes.I8
49+
――――i8 invalid because
50+
!I p: tpes.I9
4651
implicitly[I1]
4752
^
53+
newSource1.scala:28: error: implicit error;
54+
!I e: tpes.I1
55+
i1a invalid because
56+
!I p: tpes.I2
57+
58+
――i3a invalid because
59+
!I p: tpes.I4
60+
61+
――――i6a invalid because
62+
!I p: tpes.I7
63+
64+
――――――――i8 invalid because
65+
!I p: tpes.I9
66+
――――i6b invalid because
67+
!I p: tpes.I8
68+
――――――i8 invalid because
69+
!I p: tpes.I9
70+
――i3b invalid because
71+
!I p: tpes.I4
72+
73+
――――i6a invalid because
74+
!I p: tpes.I7
75+
76+
――――――――i8 invalid because
77+
!I p: tpes.I9
78+
――――i6b invalid because
79+
!I p: tpes.I8
80+
――――――i8 invalid because
81+
!I p: tpes.I9
82+
i1b invalid because
83+
!I p: tpes.I6
84+
――i6a invalid because
85+
!I p: tpes.I7
86+
87+
――――――i8 invalid because
88+
!I p: tpes.I9
89+
――i6b invalid because
90+
!I p: tpes.I8
91+
――――i8 invalid because
92+
!I p: tpes.I9
93+
implicitly[I1]
94+
^

test/files/run/splain-tree.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import scala.tools.partest._
22

33
object Test extends DirectTest {
4-
override def extraSettings: String = "-usejavacp -Vimplicits -Vimplicits-verbose-tree"
4+
override def extraSettings: String = "-usejavacp -Vimplicits"
55

66
def code: String = ""
77

@@ -39,9 +39,12 @@ object Tree
3939

4040
def show(): Unit = {
4141
val global = newCompiler()
42+
val globalVerbose = newCompiler("-Vimplicits-verbose-tree")
4243

43-
def run(code: String): Unit =
44+
def run(code: String): Unit = {
45+
compileString(globalVerbose)(code.trim)
4446
compileString(global)(code.trim)
47+
}
4548

4649
run(verboseTree)
4750
}

test/files/run/splain.check

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ newSource1.scala:13: error: implicit error;
22
!I e: ImplicitChain.II
33
ImplicitChain.g invalid because
44
!I impPar3: ImplicitChain.I1
5-
65
――ImplicitChain.i1 invalid because
76
!I impPar7: ImplicitChain.I3
87
implicitly[II]
@@ -17,6 +16,10 @@ newSource1.scala:5: error: type mismatch;
1716
^
1817
newSource1.scala:7: error: implicit error;
1918
!I e: Bounds.F[Bounds.Arg]
19+
Bounds.g invalid because
20+
nonconformant bounds;
21+
[Bounds.Arg, scala.Nothing]
22+
[A <: Bounds.Base, B]
2023
implicitly[F[Arg]]
2124
^
2225
newSource1.scala:4: error: implicit error;
@@ -120,7 +123,6 @@ Ordering.ordered invalid because
120123
!I asComparable: java.lang.Object => java.lang.Comparable[_$2]
121124
No implicit view available from Object => Comparable[_ >: Object].
122125

123-
124126
Ordering.comparatorToOrdering invalid because
125127
!I cmp: java.util.Comparator[java.lang.Object]
126128
ms.map(_ => o)

0 commit comments

Comments
 (0)