From 2461e39077f691e1f50fc0c5fd96ec9bf9f4cbf5 Mon Sep 17 00:00:00 2001
From: Peng Cheng <pc175@uow.edu.au>
Date: Sat, 19 Feb 2022 17:54:48 -0500
Subject: [PATCH] upgrade relevant test fixtures to be on par with splain 1.0.0

---
 test/files/run/splain-tree.check | 53 ++++++++++++++++++++++++++++++--
 test/files/run/splain-tree.scala |  7 +++--
 test/files/run/splain.check      |  6 ++--
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/test/files/run/splain-tree.check b/test/files/run/splain-tree.check
index 2e3c5b2597db..ce4973924d5d 100644
--- a/test/files/run/splain-tree.check
+++ b/test/files/run/splain-tree.check
@@ -16,12 +16,10 @@ i1a invalid because
             !I p: tpes.I8
 ――――――――――――――i8 invalid because
               !I p: tpes.I9
-
 ――――――――――i6b invalid because
           !I p: tpes.I8
 ――――――――――――i8 invalid because
             !I p: tpes.I9
-
 ――――i3b invalid because
     !I p: tpes.I4
 ――――――i4 invalid because
@@ -34,7 +32,10 @@ i1a invalid because
             !I p: tpes.I8
 ――――――――――――――i8 invalid because
               !I p: tpes.I9
-
+――――――――――i6b invalid because
+          !I p: tpes.I8
+――――――――――――i8 invalid because
+            !I p: tpes.I9
 i1b invalid because
 !I p: tpes.I6
 ――i6a invalid because
@@ -43,5 +44,51 @@ i1b invalid because
     !I p: tpes.I8
 ――――――i8 invalid because
       !I p: tpes.I9
+――i6b invalid because
+  !I p: tpes.I8
+――――i8 invalid because
+    !I p: tpes.I9
   implicitly[I1]
             ^
+newSource1.scala:28: error: implicit error;
+!I e: tpes.I1
+i1a invalid because
+!I p: tpes.I2
+⋮
+――i3a invalid because
+  !I p: tpes.I4
+  ⋮
+――――i6a invalid because
+    !I p: tpes.I7
+    ⋮
+――――――――i8 invalid because
+        !I p: tpes.I9
+――――i6b invalid because
+    !I p: tpes.I8
+――――――i8 invalid because
+      !I p: tpes.I9
+――i3b invalid because
+  !I p: tpes.I4
+  ⋮
+――――i6a invalid because
+    !I p: tpes.I7
+    ⋮
+――――――――i8 invalid because
+        !I p: tpes.I9
+――――i6b invalid because
+    !I p: tpes.I8
+――――――i8 invalid because
+      !I p: tpes.I9
+i1b invalid because
+!I p: tpes.I6
+――i6a invalid because
+  !I p: tpes.I7
+  ⋮
+――――――i8 invalid because
+      !I p: tpes.I9
+――i6b invalid because
+  !I p: tpes.I8
+――――i8 invalid because
+    !I p: tpes.I9
+  implicitly[I1]
+            ^
\ No newline at end of file
diff --git a/test/files/run/splain-tree.scala b/test/files/run/splain-tree.scala
index d660ee85d3f2..56f9ff7a3f16 100644
--- a/test/files/run/splain-tree.scala
+++ b/test/files/run/splain-tree.scala
@@ -1,7 +1,7 @@
 import scala.tools.partest._
 
 object Test extends DirectTest {
-  override def extraSettings: String = "-usejavacp -Vimplicits -Vimplicits-verbose-tree"
+  override def extraSettings: String = "-usejavacp -Vimplicits"
 
   def code: String = ""
 
@@ -39,9 +39,12 @@ object Tree
 
   def show(): Unit = {
     val global = newCompiler()
+    val globalVerbose = newCompiler("-Vimplicits-verbose-tree")
 
-    def run(code: String): Unit =
+    def run(code: String): Unit = {
+      compileString(globalVerbose)(code.trim)
       compileString(global)(code.trim)
+    }
 
     run(verboseTree)
   }
diff --git a/test/files/run/splain.check b/test/files/run/splain.check
index 9dbb8db96b7c..9c41024605b2 100644
--- a/test/files/run/splain.check
+++ b/test/files/run/splain.check
@@ -2,7 +2,6 @@ newSource1.scala:13: error: implicit error;
 !I e: ImplicitChain.II
 ImplicitChain.g invalid because
 !I impPar3: ImplicitChain.I1
-⋮
 ――ImplicitChain.i1 invalid because
   !I impPar7: ImplicitChain.I3
   implicitly[II]
@@ -13,6 +12,10 @@ newSource1.scala:6: error: type mismatch;
     ^
 newSource1.scala:7: error: implicit error;
 !I e: Bounds.F[Bounds.Arg]
+Bounds.g invalid because
+nonconformant bounds;
+[Bounds.Arg, scala.Nothing]
+[A <: Bounds.Base, B]
   implicitly[F[Arg]]
             ^
 newSource1.scala:4: error: implicit error;
@@ -116,7 +119,6 @@ Ordering.ordered invalid because
 !I asComparable: java.lang.Object => java.lang.Comparable[_$2]
   No implicit view available from Object => Comparable[_ >: Object].
 
-⋮
 Ordering.comparatorToOrdering invalid because
 !I cmp: java.util.Comparator[java.lang.Object]
     ms.map(_ => o)