From 9140cec39c33896207cfdb759b18e6a8b0368a9a Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 7 Apr 2021 09:27:38 +0100
Subject: [PATCH] Revert -Vimplicits back to default false

---
 .../tools/nsc/settings/ScalaSettings.scala    |   2 +-
 test/files/neg/classtags_contextbound_a.check |   5 +-
 test/files/neg/classtags_contextbound_b.check |   5 +-
 test/files/neg/classtags_contextbound_c.check |   5 +-
 .../neg/classtags_dont_use_typetags.check     |   5 +-
 test/files/neg/implicits.check                |   3 +-
 ...op_abstypetags_arenot_classmanifests.check |   5 +-
 ...interop_abstypetags_arenot_classtags.check |   5 +-
 ...interop_abstypetags_arenot_manifests.check |   5 +-
 ...terop_classmanifests_arenot_typetags.check |   5 +-
 .../interop_classtags_arenot_manifests.check  |   5 +-
 ...terop_typetags_arenot_classmanifests.check |   5 +-
 .../interop_typetags_arenot_classtags.check   |   5 +-
 test/files/neg/leibniz-liskov.check           |  35 +-
 test/files/neg/literate_existentials.check    |   5 +-
 test/files/neg/macro-cyclic.check             |   3 +-
 .../neg/macro-divergence-controlled.check     |   3 +-
 ...ro-reify-typetag-hktypeparams-notags.check |  10 +-
 ...acro-reify-typetag-typeparams-notags.check |  10 +-
 .../macro-reify-typetag-useabstypetag.check   |  10 +-
 test/files/neg/missing-implicit.check         |  50 +--
 test/files/neg/sortedImplicitNotFound.check   | 316 ++----------------
 test/files/neg/t0226.check                    |   3 +-
 test/files/neg/t10066.check                   |   6 +-
 test/files/neg/t10156.check                   |   3 +-
 test/files/neg/t10279.check                   |   9 +-
 test/files/neg/t11591.check                   |   5 +-
 test/files/neg/t11643.check                   |   6 +-
 test/files/neg/t11823.check                   |   6 +-
 test/files/neg/t2405.check                    |   3 +-
 test/files/neg/t2421b.check                   |   3 +-
 test/files/neg/t2462a.check                   |   5 +-
 test/files/neg/t2462c.check                   |  25 +-
 test/files/neg/t3346b.check                   |   3 +-
 test/files/neg/t3399.check                    |   5 +-
 test/files/neg/t3507-old.check                |   5 +-
 test/files/neg/t3977.check                    |   3 +-
 test/files/neg/t4079.check                    |   3 +-
 test/files/neg/t4270.check                    |   3 +-
 test/files/neg/t4889.check                    |   3 +-
 test/files/neg/t550.check                     |   3 +-
 test/files/neg/t5553_2.check                  |  12 +-
 test/files/neg/t5801.check                    |   6 +-
 test/files/neg/t5803.check                    |   3 +-
 test/files/neg/t6528.check                    |   3 +-
 test/files/neg/t7289.check                    |   5 +-
 test/files/neg/t7289_status_quo.check         |  19 +-
 test/files/neg/t7509.check                    |   3 +-
 test/files/neg/t7686.check                    |  15 +-
 test/files/neg/t8104.check                    |   3 +-
 test/files/neg/t8291.check                    |  10 +-
 test/files/neg/t8372.check                    |  10 +-
 test/files/neg/t9041.check                    |   3 +-
 test/files/neg/t9717.check                    |   6 +-
 test/files/neg/t9960.check                    |  10 +-
 ...without_scala_reflect_typetag_lookup.check |   3 +-
 ...ala_reflect_typetag_manifest_interop.check |   5 +-
 57 files changed, 121 insertions(+), 599 deletions(-)

diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
index 3c2d805b3f5a..c8cbecd02099 100644
--- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -507,7 +507,7 @@ trait ScalaSettings extends StandardScalaSettings with Warnings { _: MutableSett
     .withAbbreviation("-Yhot-statistics")
   val Yshowsyms       = BooleanSetting("-Vsymbols", "Print the AST symbol hierarchy after each phase.") withAbbreviation "-Yshow-syms"
   val Ytyperdebug        = BooleanSetting("-Vtyper", "Trace type assignments.") withAbbreviation "-Ytyper-debug"
-  val Vimplicits            = BooleanSetting("-Vimplicits", "Print dependent missing implicits.", true).withAbbreviation("-Xlog-implicits")
+  val Vimplicits            = BooleanSetting("-Vimplicits", "Print dependent missing implicits.").withAbbreviation("-Xlog-implicits")
   val VimplicitsVerboseTree = BooleanSetting("-Vimplicits-verbose-tree", "Display all intermediate implicits in a chain.")
   val VimplicitsMaxRefined  = IntSetting("-Vimplicits-max-refined", "max chars for printing refined types, abbreviate to `F {...}`", Int.MaxValue, Some((0, Int.MaxValue)), _ => None)
   val VtypeDiffs            = BooleanSetting("-Vtype-diffs", "Print found/required error messages as colored diffs.")
diff --git a/test/files/neg/classtags_contextbound_a.check b/test/files/neg/classtags_contextbound_a.check
index 850688d2c1d9..b74d7f8b5843 100644
--- a/test/files/neg/classtags_contextbound_a.check
+++ b/test/files/neg/classtags_contextbound_a.check
@@ -1,7 +1,4 @@
-classtags_contextbound_a.scala:2: error: implicit error;
-!I evidence$5: ClassTag[T]
-  No ClassTag available for T
-
+classtags_contextbound_a.scala:2: error: No ClassTag available for T
   def foo[T] = Array[T]()
                        ^
 1 error
diff --git a/test/files/neg/classtags_contextbound_b.check b/test/files/neg/classtags_contextbound_b.check
index 124afe85a058..42e8e68467c0 100644
--- a/test/files/neg/classtags_contextbound_b.check
+++ b/test/files/neg/classtags_contextbound_b.check
@@ -1,7 +1,4 @@
-classtags_contextbound_b.scala:5: error: implicit error;
-!I evidence$1: ClassTag[T]
-  No ClassTag available for T
-
+classtags_contextbound_b.scala:5: error: No ClassTag available for T
   def foo[T] = mkArray[T]
                       ^
 1 error
diff --git a/test/files/neg/classtags_contextbound_c.check b/test/files/neg/classtags_contextbound_c.check
index e191cdf852a5..8bab1bfd4a9b 100644
--- a/test/files/neg/classtags_contextbound_c.check
+++ b/test/files/neg/classtags_contextbound_c.check
@@ -1,7 +1,4 @@
-classtags_contextbound_c.scala:4: error: implicit error;
-!I evidence$5: ClassTag[T]
-  No ClassTag available for T
-
+classtags_contextbound_c.scala:4: error: No ClassTag available for T
   def mkArray[T] = Array[T]()
                            ^
 1 error
diff --git a/test/files/neg/classtags_dont_use_typetags.check b/test/files/neg/classtags_dont_use_typetags.check
index c305f45a86c5..5c7bd9492a22 100644
--- a/test/files/neg/classtags_dont_use_typetags.check
+++ b/test/files/neg/classtags_dont_use_typetags.check
@@ -1,7 +1,4 @@
-classtags_dont_use_typetags.scala:4: error: implicit error;
-!I evidence$5: ClassTag[T]
-  No ClassTag available for T
-
+classtags_dont_use_typetags.scala:4: error: No ClassTag available for T
   def foo[T: TypeTag] = Array[T]()
                                 ^
 1 error
diff --git a/test/files/neg/implicits.check b/test/files/neg/implicits.check
index e76441ad82e4..2eb03eb5f3db 100644
--- a/test/files/neg/implicits.check
+++ b/test/files/neg/implicits.check
@@ -13,8 +13,7 @@ implicits.scala:47: error: type mismatch;
  required: Mxml
                 case a => List(a)
                                ^
-implicits.scala:59: error: implicit error;
-!I x: Nothing
+implicits.scala:59: error: could not find implicit value for parameter x: Nothing
   foo {
       ^
 4 errors
diff --git a/test/files/neg/interop_abstypetags_arenot_classmanifests.check b/test/files/neg/interop_abstypetags_arenot_classmanifests.check
index cc6806d64c4f..d918e02840dd 100644
--- a/test/files/neg/interop_abstypetags_arenot_classmanifests.check
+++ b/test/files/neg/interop_abstypetags_arenot_classmanifests.check
@@ -1,7 +1,4 @@
-interop_abstypetags_arenot_classmanifests.scala:6: error: implicit error;
-!I e: ClassTag[T]
-  No ClassManifest available for T.
-
+interop_abstypetags_arenot_classmanifests.scala:6: error: No ClassManifest available for T.
     println(implicitly[ClassManifest[T]])
                       ^
 1 error
diff --git a/test/files/neg/interop_abstypetags_arenot_classtags.check b/test/files/neg/interop_abstypetags_arenot_classtags.check
index c1f7248b3c08..2cae95fc39f5 100644
--- a/test/files/neg/interop_abstypetags_arenot_classtags.check
+++ b/test/files/neg/interop_abstypetags_arenot_classtags.check
@@ -1,7 +1,4 @@
-interop_abstypetags_arenot_classtags.scala:6: error: implicit error;
-!I ctag: ClassTag[T]
-  No ClassTag available for T
-
+interop_abstypetags_arenot_classtags.scala:6: error: No ClassTag available for T
     println(classTag[T])
                     ^
 1 error
diff --git a/test/files/neg/interop_abstypetags_arenot_manifests.check b/test/files/neg/interop_abstypetags_arenot_manifests.check
index 5b3f97afca98..3c3668f6128a 100644
--- a/test/files/neg/interop_abstypetags_arenot_manifests.check
+++ b/test/files/neg/interop_abstypetags_arenot_manifests.check
@@ -1,7 +1,4 @@
-interop_abstypetags_arenot_manifests.scala:5: error: implicit error;
-!I m: Manifest[T]
-  No Manifest available for T.
-
+interop_abstypetags_arenot_manifests.scala:5: error: No Manifest available for T.
     println(manifest[T])
                     ^
 1 error
diff --git a/test/files/neg/interop_classmanifests_arenot_typetags.check b/test/files/neg/interop_classmanifests_arenot_typetags.check
index c323a5c0dfd9..fdc7eafe2a15 100644
--- a/test/files/neg/interop_classmanifests_arenot_typetags.check
+++ b/test/files/neg/interop_classmanifests_arenot_typetags.check
@@ -1,7 +1,4 @@
-interop_classmanifests_arenot_typetags.scala:6: error: implicit error;
-!I e: TypeTag[T]
-  No TypeTag available for T
-
+interop_classmanifests_arenot_typetags.scala:6: error: No TypeTag available for T
     println(implicitly[TypeTag[T]])
                       ^
 1 error
diff --git a/test/files/neg/interop_classtags_arenot_manifests.check b/test/files/neg/interop_classtags_arenot_manifests.check
index 13f5fc54947f..3fe0b90be4e1 100644
--- a/test/files/neg/interop_classtags_arenot_manifests.check
+++ b/test/files/neg/interop_classtags_arenot_manifests.check
@@ -1,7 +1,4 @@
-interop_classtags_arenot_manifests.scala:5: error: implicit error;
-!I m: Manifest[T]
-  No Manifest available for T.
-
+interop_classtags_arenot_manifests.scala:5: error: No Manifest available for T.
     println(manifest[T])
                     ^
 1 error
diff --git a/test/files/neg/interop_typetags_arenot_classmanifests.check b/test/files/neg/interop_typetags_arenot_classmanifests.check
index 29b66cb995bc..0925e6ffba7e 100644
--- a/test/files/neg/interop_typetags_arenot_classmanifests.check
+++ b/test/files/neg/interop_typetags_arenot_classmanifests.check
@@ -1,7 +1,4 @@
-interop_typetags_arenot_classmanifests.scala:6: error: implicit error;
-!I e: ClassTag[T]
-  No ClassManifest available for T.
-
+interop_typetags_arenot_classmanifests.scala:6: error: No ClassManifest available for T.
     println(implicitly[ClassManifest[T]])
                       ^
 1 error
diff --git a/test/files/neg/interop_typetags_arenot_classtags.check b/test/files/neg/interop_typetags_arenot_classtags.check
index fb469c8108aa..7eaad2efd641 100644
--- a/test/files/neg/interop_typetags_arenot_classtags.check
+++ b/test/files/neg/interop_typetags_arenot_classtags.check
@@ -1,7 +1,4 @@
-interop_typetags_arenot_classtags.scala:6: error: implicit error;
-!I ctag: ClassTag[T]
-  No ClassTag available for T
-
+interop_typetags_arenot_classtags.scala:6: error: No ClassTag available for T
     println(classTag[T])
                     ^
 1 error
diff --git a/test/files/neg/leibniz-liskov.check b/test/files/neg/leibniz-liskov.check
index e990ac07b197..c760861dbbf6 100644
--- a/test/files/neg/leibniz-liskov.check
+++ b/test/files/neg/leibniz-liskov.check
@@ -1,37 +1,19 @@
-leibniz-liskov.scala:7: error: implicit error;
-!I e: A =:= B
-  Cannot prove that LeibnizLiskov.this.A =:= LeibnizLiskov.this.B.
-
+leibniz-liskov.scala:7: error: Cannot prove that LeibnizLiskov.this.A =:= LeibnizLiskov.this.B.
   implicitly[A =:= B]
             ^
-leibniz-liskov.scala:8: error: implicit error;
-!I e: B =:= A
-  Cannot prove that LeibnizLiskov.this.B =:= LeibnizLiskov.this.A.
-
+leibniz-liskov.scala:8: error: Cannot prove that LeibnizLiskov.this.B =:= LeibnizLiskov.this.A.
   implicitly[B =:= A]
             ^
-leibniz-liskov.scala:11: error: implicit error;
-!I e: A <:< SA
-  Cannot prove that LeibnizLiskov.this.A <:< LeibnizLiskov.this.SA.
-
+leibniz-liskov.scala:11: error: Cannot prove that LeibnizLiskov.this.A <:< LeibnizLiskov.this.SA.
   implicitly[A <:< SA]
             ^
-leibniz-liskov.scala:12: error: implicit error;
-!I e: SB <:< B
-  Cannot prove that LeibnizLiskov.this.SB <:< LeibnizLiskov.this.B.
-
+leibniz-liskov.scala:12: error: Cannot prove that LeibnizLiskov.this.SB <:< LeibnizLiskov.this.B.
   implicitly[SB <:< B]
             ^
-leibniz-liskov.scala:13: error: implicit error;
-!I e: SA <:< B
-  Cannot prove that LeibnizLiskov.this.SA <:< LeibnizLiskov.this.B.
-
+leibniz-liskov.scala:13: error: Cannot prove that LeibnizLiskov.this.SA <:< LeibnizLiskov.this.B.
   implicitly[SA <:< B]
             ^
-leibniz-liskov.scala:14: error: implicit error;
-!I e: A <:< SB
-  Cannot prove that LeibnizLiskov.this.A <:< LeibnizLiskov.this.SB.
-
+leibniz-liskov.scala:14: error: Cannot prove that LeibnizLiskov.this.A <:< LeibnizLiskov.this.SB.
   implicitly[A <:< SB]
             ^
 leibniz-liskov.scala:18: error: no type parameters for method substituteCo: (ff: F[LeibnizLiskov.this.A]): F[LeibnizLiskov.this.B] exist so that it can be applied to arguments (List[LeibnizLiskov.this.B])
@@ -58,10 +40,7 @@ leibniz-liskov.scala:19: error: type mismatch;
  required: F[LeibnizLiskov.this.B]
   aEqB.substituteContra(List(A(), A(), A()))
                             ^
-leibniz-liskov.scala:20: error: implicit error;
-!I e: xs.type <:< List[B]
-  Cannot prove that xs.type <:< List[LeibnizLiskov.this.B].
-
+leibniz-liskov.scala:20: error: Cannot prove that xs.type <:< List[LeibnizLiskov.this.B].
   locally { val xs = aEqB.flip.liftCo[List](List(B(), B(), B())); implicitly[xs.type <:< List[B]] }
                                                                             ^
 leibniz-liskov.scala:21: error: no type parameters for method substituteContra: (ft: F[U]): F[T] exist so that it can be applied to arguments (List[T])
diff --git a/test/files/neg/literate_existentials.check b/test/files/neg/literate_existentials.check
index a7b4eeacae2c..73b45c0af204 100644
--- a/test/files/neg/literate_existentials.check
+++ b/test/files/neg/literate_existentials.check
@@ -1,7 +1,4 @@
-literate_existentials.scala:189: error: implicit error;
-!I e: Int <:< M
-  Cannot prove that Int <:< M forSome { type M <: String }.
-
+literate_existentials.scala:189: error: Cannot prove that Int <:< M forSome { type M <: String }.
   implicitly[Int <:< (M forSome { type M >: Nothing <: String })] // fails
             ^
 1 error
diff --git a/test/files/neg/macro-cyclic.check b/test/files/neg/macro-cyclic.check
index e39b8a45c044..79dadefb66c0 100644
--- a/test/files/neg/macro-cyclic.check
+++ b/test/files/neg/macro-cyclic.check
@@ -1,5 +1,4 @@
-Impls_Macros_1.scala:6: error: implicit error;
-!I e: SourceLocation
+Impls_Macros_1.scala:6: error: could not find implicit value for parameter e: SourceLocation
     c.universe.reify { implicitly[SourceLocation] }
                                  ^
 1 error
diff --git a/test/files/neg/macro-divergence-controlled.check b/test/files/neg/macro-divergence-controlled.check
index a7cdab37cc99..030a8c40ffc3 100644
--- a/test/files/neg/macro-divergence-controlled.check
+++ b/test/files/neg/macro-divergence-controlled.check
@@ -1,5 +1,4 @@
-Test_2.scala:2: error: implicit error;
-!I e: Complex[Foo]
+Test_2.scala:2: error: could not find implicit value for parameter e: Complex[Foo]
   println(implicitly[Complex[Foo]])
                     ^
 1 error
diff --git a/test/files/neg/macro-reify-typetag-hktypeparams-notags.check b/test/files/neg/macro-reify-typetag-hktypeparams-notags.check
index c000a798132e..ce218cdbc28e 100644
--- a/test/files/neg/macro-reify-typetag-hktypeparams-notags.check
+++ b/test/files/neg/macro-reify-typetag-hktypeparams-notags.check
@@ -1,13 +1,7 @@
-Test.scala:5: error: implicit error;
-!I e: TypeTag[C[T]]
-  No TypeTag available for C[T]
-
+Test.scala:5: error: No TypeTag available for C[T]
     println(implicitly[TypeTag[C[T]]])
                       ^
-Test.scala:6: error: implicit error;
-!I e: TypeTag[List[C[T]]]
-  No TypeTag available for List[C[T]]
-
+Test.scala:6: error: No TypeTag available for List[C[T]]
     println(implicitly[TypeTag[List[C[T]]]])
                       ^
 2 errors
diff --git a/test/files/neg/macro-reify-typetag-typeparams-notags.check b/test/files/neg/macro-reify-typetag-typeparams-notags.check
index 251622e82e5e..65a08a6d3e7c 100644
--- a/test/files/neg/macro-reify-typetag-typeparams-notags.check
+++ b/test/files/neg/macro-reify-typetag-typeparams-notags.check
@@ -1,13 +1,7 @@
-Test.scala:5: error: implicit error;
-!I e: TypeTag[T]
-  No TypeTag available for T
-
+Test.scala:5: error: No TypeTag available for T
     println(implicitly[TypeTag[T]])
                       ^
-Test.scala:6: error: implicit error;
-!I e: TypeTag[List[T]]
-  No TypeTag available for List[T]
-
+Test.scala:6: error: No TypeTag available for List[T]
     println(implicitly[TypeTag[List[T]]])
                       ^
 2 errors
diff --git a/test/files/neg/macro-reify-typetag-useabstypetag.check b/test/files/neg/macro-reify-typetag-useabstypetag.check
index 251622e82e5e..65a08a6d3e7c 100644
--- a/test/files/neg/macro-reify-typetag-useabstypetag.check
+++ b/test/files/neg/macro-reify-typetag-useabstypetag.check
@@ -1,13 +1,7 @@
-Test.scala:5: error: implicit error;
-!I e: TypeTag[T]
-  No TypeTag available for T
-
+Test.scala:5: error: No TypeTag available for T
     println(implicitly[TypeTag[T]])
                       ^
-Test.scala:6: error: implicit error;
-!I e: TypeTag[List[T]]
-  No TypeTag available for List[T]
-
+Test.scala:6: error: No TypeTag available for List[T]
     println(implicitly[TypeTag[List[T]]])
                       ^
 2 errors
diff --git a/test/files/neg/missing-implicit.check b/test/files/neg/missing-implicit.check
index 1f4703a20e94..bc043b4b2958 100644
--- a/test/files/neg/missing-implicit.check
+++ b/test/files/neg/missing-implicit.check
@@ -1,61 +1,31 @@
-missing-implicit.scala:23: error: implicit error;
-!I e: TC[String] {type Int = <none>}
-   (foo)
-
+missing-implicit.scala:23: error: could not find implicit value for parameter e: TC[String]{type Int} (foo)
   implicitly[TC[String] { type Int}]
             ^
-missing-implicit.scala:24: error: implicit error;
-!I e: XC[String]
-  bar
-
+missing-implicit.scala:24: error: bar
   implicitly[XC[String]]
             ^
-missing-implicit.scala:25: error: implicit error;
-!I e: U
-   (nope)
-
+missing-implicit.scala:25: error: could not find implicit value for parameter e: U (nope)
   implicitly[U]
             ^
-missing-implicit.scala:26: error: implicit error;
-!I e: V
-  no way
-
+missing-implicit.scala:26: error: no way
   implicitly[V]
             ^
-missing-implicit.scala:31: error: implicit error;
-!I v: V
-  no way
-
+missing-implicit.scala:31: error: no way
   f
   ^
-missing-implicit.scala:32: error: implicit error;
-!I v: V
-  huh
-
+missing-implicit.scala:32: error: huh
   g
   ^
-missing-implicit.scala:49: error: implicit error;
-!I e: F[Int]
-  No F of Int
-
+missing-implicit.scala:49: error: No F of Int
   implicitly[F[Int]]
             ^
-missing-implicit.scala:50: error: implicit error;
-!I e: M[Int]
-   (No F of Int)
-
+missing-implicit.scala:50: error: could not find implicit value for parameter e: M[Int] (No F of Int)
   implicitly[M[Int]]
             ^
-missing-implicit.scala:51: error: implicit error;
-!I e: AX
-   (No F of String)
-
+missing-implicit.scala:51: error: could not find implicit value for parameter e: AX (No F of String)
   implicitly[AX]
             ^
-missing-implicit.scala:52: error: implicit error;
-!I e: X0
-   (Missing X3 of Char and Int and String)
-
+missing-implicit.scala:52: error: could not find implicit value for parameter e: X0 (Missing X3 of Char and Int and String)
   implicitly[X0]
             ^
 10 errors
diff --git a/test/files/neg/sortedImplicitNotFound.check b/test/files/neg/sortedImplicitNotFound.check
index 28102161b260..788c9a022085 100644
--- a/test/files/neg/sortedImplicitNotFound.check
+++ b/test/files/neg/sortedImplicitNotFound.check
@@ -1,346 +1,80 @@
-sortedImplicitNotFound.scala:10: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:10: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   ms.map(_ => o)
         ^
-sortedImplicitNotFound.scala:13: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:13: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   ms.flatMap(_ => List(o))
             ^
-sortedImplicitNotFound.scala:16: error: implicit error;
-!I ev: Ordering[(Int,Object)]
-  No implicit Ordering[Object] found to build a SortedSet[(Int, Object)]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: (Int,Object) => Comparable[_$2]
-  No implicit view available from (Int, Object) => Comparable[_ >: (Int, Object)].
-
-⋮
-――Ordering.ordered invalid because
-  !I asComparable: Object => Comparable[_$2]
-    No implicit view available from Object => Comparable[_ >: Object].
-
-――Ordering.comparatorToOrdering invalid because
-  !I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:16: error: No implicit Ordering[Object] found to build a SortedSet[(Int, Object)]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   ms.zip(List(o))
         ^
-sortedImplicitNotFound.scala:19: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:19: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   ms.collect{case _ => o}
             ^
-sortedImplicitNotFound.scala:24: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:24: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   is.map(_ => o)
         ^
-sortedImplicitNotFound.scala:27: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:27: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   is.flatMap(_ => List(o))
             ^
-sortedImplicitNotFound.scala:30: error: implicit error;
-!I ev: Ordering[(Int,Object)]
-  No implicit Ordering[Object] found to build a SortedSet[(Int, Object)]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: (Int,Object) => Comparable[_$2]
-  No implicit view available from (Int, Object) => Comparable[_ >: (Int, Object)].
-
-⋮
-――Ordering.ordered invalid because
-  !I asComparable: Object => Comparable[_$2]
-    No implicit view available from Object => Comparable[_ >: Object].
-
-――Ordering.comparatorToOrdering invalid because
-  !I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:30: error: No implicit Ordering[Object] found to build a SortedSet[(Int, Object)]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   is.zip(List(o))
         ^
-sortedImplicitNotFound.scala:33: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:33: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   is.collect{case _ => o}
             ^
-sortedImplicitNotFound.scala:39: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:39: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   mb.map(_ => o)
         ^
-sortedImplicitNotFound.scala:43: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:43: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   mb.flatMap(_ => List(o))
             ^
-sortedImplicitNotFound.scala:47: error: implicit error;
-!I ev: Ordering[(Int,Object)]
-  No implicit Ordering[Object] found to build a SortedSet[(Int, Object)]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: (Int,Object) => Comparable[_$2]
-  No implicit view available from (Int, Object) => Comparable[_ >: (Int, Object)].
-
-⋮
-――Ordering.ordered invalid because
-  !I asComparable: Object => Comparable[_$2]
-    No implicit view available from Object => Comparable[_ >: Object].
-
-――Ordering.comparatorToOrdering invalid because
-  !I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:47: error: No implicit Ordering[Object] found to build a SortedSet[(Int, Object)]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   mb.zip(List(o))
         ^
-sortedImplicitNotFound.scala:51: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:51: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   mb.collect{case _ => o}
             ^
-sortedImplicitNotFound.scala:57: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:57: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   ib.map(_ => o)
         ^
-sortedImplicitNotFound.scala:61: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:61: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   ib.flatMap(_ => List(o))
             ^
-sortedImplicitNotFound.scala:65: error: implicit error;
-!I ev: Ordering[(Int,Object)]
-  No implicit Ordering[Object] found to build a SortedSet[(Int, Object)]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: (Int,Object) => Comparable[_$2]
-  No implicit view available from (Int, Object) => Comparable[_ >: (Int, Object)].
-
-⋮
-――Ordering.ordered invalid because
-  !I asComparable: Object => Comparable[_$2]
-    No implicit view available from Object => Comparable[_ >: Object].
-
-――Ordering.comparatorToOrdering invalid because
-  !I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:65: error: No implicit Ordering[Object] found to build a SortedSet[(Int, Object)]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   ib.zip(List(o))
         ^
-sortedImplicitNotFound.scala:69: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:69: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Int] first by calling `unsorted`.
   ib.collect{case _ => o}
             ^
-sortedImplicitNotFound.scala:74: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Value] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:74: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Value] first by calling `unsorted`.
   es.map(_ => o)
         ^
-sortedImplicitNotFound.scala:77: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Value] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:77: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Value] first by calling `unsorted`.
   es.flatMap(_ => List(o))
             ^
 sortedImplicitNotFound.scala:80: error: diverging implicit expansion for type Ordering[(WeekDay.Value, Object)]
 starting with method orderingToOrdered in object Ordered
   es.zip(List(o)) // ah well...: diverging implicit expansion for type Ordering[(WeekDay.Value, Object)]
         ^
-sortedImplicitNotFound.scala:83: error: implicit error;
-!I ev: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Value] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:83: error: No implicit Ordering[Object] found to build a SortedSet[Object]. You may want to upcast to a Set[Value] first by calling `unsorted`.
   es.collect{case _ => o}
             ^
-sortedImplicitNotFound.scala:88: error: implicit error;
-!I ordering: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:88: error: No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
   mm.map(_ => (o, o))
         ^
-sortedImplicitNotFound.scala:91: error: implicit error;
-!I ordering: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:91: error: No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
   mm.flatMap(_ => List((o, o)))
             ^
-sortedImplicitNotFound.scala:94: error: implicit error;
-!I ordering: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:94: error: No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
   mm.collect{case _ => (o, o)}
             ^
-sortedImplicitNotFound.scala:99: error: implicit error;
-!I ordering: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:99: error: No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
   im.map(_ => (o, o))
         ^
-sortedImplicitNotFound.scala:102: error: implicit error;
-!I ordering: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:102: error: No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
   im.flatMap(_ => List((o, o)))
             ^
-sortedImplicitNotFound.scala:105: error: implicit error;
-!I ordering: Ordering[Object]
-  No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
-
-Ordering.ordered invalid because
-!I asComparable: Object => Comparable[_$2]
-  No implicit view available from Object => Comparable[_ >: Object].
-
-⋮
-Ordering.comparatorToOrdering invalid because
-!I cmp: Comparator[Object]
+sortedImplicitNotFound.scala:105: error: No implicit Ordering[Object] found to build a SortedMap[Object, Object]. You may want to upcast to a Map[Int, Object] first by calling `unsorted`.
   im.collect{case _ => (o, o)}
             ^
 26 errors
diff --git a/test/files/neg/t0226.check b/test/files/neg/t0226.check
index 860b5a70bdf8..7c7391c8452a 100644
--- a/test/files/neg/t0226.check
+++ b/test/files/neg/t0226.check
@@ -4,8 +4,7 @@ t0226.scala:5: error: not found: type A1
 t0226.scala:5: error: not found: type A1
       (implicit _1: Foo[List[A1]], _2: Foo[A2]): Foo[Tuple2[List[A1], A2]] =
                              ^
-t0226.scala:8: error: implicit error;
-!I rep: Foo[((List[Char],Int),(Nil.type,Int))]
+t0226.scala:8: error: could not find implicit value for parameter rep: Test.this.Foo[((List[Char], Int), (collection.immutable.Nil.type, Int))]
   foo(((List('b'), 3), (Nil, 4)))
      ^
 3 errors
diff --git a/test/files/neg/t10066.check b/test/files/neg/t10066.check
index 74c6fd3eb8b2..438965fc6c0e 100644
--- a/test/files/neg/t10066.check
+++ b/test/files/neg/t10066.check
@@ -1,9 +1,7 @@
-t10066.scala:33: error: implicit error;
-!I extractor: Extractor[String]
+t10066.scala:33: error: could not find implicit value for parameter extractor: dynamicrash.Extractor[String]
   println(storage.foo[String])
           ^
-t10066.scala:37: error: implicit error;
-!I extractor: Extractor[A]
+t10066.scala:37: error: could not find implicit value for parameter extractor: dynamicrash.Extractor[A]
   println(storage.foo)
           ^
 2 errors
diff --git a/test/files/neg/t10156.check b/test/files/neg/t10156.check
index 0ab1e9f7ee0e..e0c7e828aa8c 100644
--- a/test/files/neg/t10156.check
+++ b/test/files/neg/t10156.check
@@ -1,5 +1,4 @@
-t10156.scala:4: error: implicit error;
-!I a: A
+t10156.scala:4: error: could not find implicit value for parameter a: t10156.A
   val z = x _
           ^
 1 error
diff --git a/test/files/neg/t10279.check b/test/files/neg/t10279.check
index a9ea7f2840b5..a399a2b15041 100644
--- a/test/files/neg/t10279.check
+++ b/test/files/neg/t10279.check
@@ -1,12 +1,10 @@
-t10279.scala:5: error: implicit error;
-!I s: String
+t10279.scala:5: error: could not find implicit value for parameter s: String
   val t1 = foo(1) _     // error: no implicit string
               ^
 t10279.scala:6: error: _ must follow method; cannot follow String
   val t2 = foo(1)("") _ // error: _ must follow method
                  ^
-t10279.scala:7: error: implicit error;
-!I s: String
+t10279.scala:7: error: could not find implicit value for parameter s: String
   val t3 = foo _        // error: no implicit string
            ^
 t10279.scala:14: error: type mismatch;
@@ -14,8 +12,7 @@ t10279.scala:14: error: type mismatch;
  required: ? => ?
   val t6 = { implicit val i = 0; bar(0) _ } // error: type mismatch, found Int, required: ? => ?
                                     ^
-t10279.scala:17: error: implicit error;
-!I x: Int
+t10279.scala:17: error: could not find implicit value for parameter x: Int
   val barSimple = fooSimple _ // error: no implicit int
                   ^
 5 errors
diff --git a/test/files/neg/t11591.check b/test/files/neg/t11591.check
index 88cbe410559f..4d110a4c3ab3 100644
--- a/test/files/neg/t11591.check
+++ b/test/files/neg/t11591.check
@@ -1,7 +1,4 @@
-t11591.scala:8: error: implicit error;
-!I e: A
-――Test.mkB invalid because
-  !I i: Int
+t11591.scala:8: error: could not find implicit value for parameter e: Test.A
   implicitly[A]
             ^
 1 error
diff --git a/test/files/neg/t11643.check b/test/files/neg/t11643.check
index 5b23dc3df2a5..9db82b3af825 100644
--- a/test/files/neg/t11643.check
+++ b/test/files/neg/t11643.check
@@ -1,9 +1,7 @@
-t11643.scala:6: error: implicit error;
-!I i: Int
+t11643.scala:6: error: could not find implicit value for parameter i: Int
   def g(j: Int) = j + f
                       ^
-t11643.scala:7: error: implicit error;
-!I i: Int
+t11643.scala:7: error: could not find implicit value for parameter i: Int
   def k(j: Int) = { val x = j + f ; 42 }
                                 ^
 2 errors
diff --git a/test/files/neg/t11823.check b/test/files/neg/t11823.check
index 16f8734ab657..de9c19058768 100644
--- a/test/files/neg/t11823.check
+++ b/test/files/neg/t11823.check
@@ -1,9 +1,7 @@
-t11823.scala:7: error: implicit error;
-!I e: Foo[String]
+t11823.scala:7: error: could not find implicit value for parameter e: Test.Foo[String]
   val fooString: Foo[String] = implicitly
                                ^
-t11823.scala:8: error: implicit error;
-!I foo: Foo[String]
+t11823.scala:8: error: could not find implicit value for parameter foo: Test.Foo[String]
   val barString: Bar[String] = bar
                                ^
 2 errors
diff --git a/test/files/neg/t2405.check b/test/files/neg/t2405.check
index da589b404adf..c944aafcba12 100644
--- a/test/files/neg/t2405.check
+++ b/test/files/neg/t2405.check
@@ -1,5 +1,4 @@
-t2405.scala:8: error: implicit error;
-!I e: Int
+t2405.scala:8: error: could not find implicit value for parameter e: Int
 		implicitly[Int]
 		          ^
 t2405.scala:6: warning: imported `y` is permanently hidden by definition of method y
diff --git a/test/files/neg/t2421b.check b/test/files/neg/t2421b.check
index eadb444b2d44..7c714f1c9bd7 100644
--- a/test/files/neg/t2421b.check
+++ b/test/files/neg/t2421b.check
@@ -1,5 +1,4 @@
-t2421b.scala:12: error: implicit error;
-!I aa: F[A]
+t2421b.scala:12: error: could not find implicit value for parameter aa: Test.F[Test.A]
   f
   ^
 1 error
diff --git a/test/files/neg/t2462a.check b/test/files/neg/t2462a.check
index 2b3819045038..671acdc29346 100644
--- a/test/files/neg/t2462a.check
+++ b/test/files/neg/t2462a.check
@@ -1,7 +1,4 @@
-t2462a.scala:6: error: implicit error;
-!I bf: BuildFrom[List[Int], Int, List[String]]
-  Cannot construct a collection of type List[String] with elements of type Int based on a collection of type List[Int].
-
+t2462a.scala:6: error: Cannot construct a collection of type List[String] with elements of type Int based on a collection of type List[Int].
   def foo(l: Lst[Int]) = l.map[Int, List[String]](x => 1)
                                                  ^
 1 error
diff --git a/test/files/neg/t2462c.check b/test/files/neg/t2462c.check
index 594967b8904d..3b425b41730d 100644
--- a/test/files/neg/t2462c.check
+++ b/test/files/neg/t2462c.check
@@ -1,31 +1,16 @@
-t2462c.scala:26: error: implicit error;
-!I evidence$1: C[X$Y]
-  No C of X$Y
-
+t2462c.scala:26: error: No C of X$Y
   f[X$Y]
    ^
-t2462c.scala:32: error: implicit error;
-!I evidence$1: C[Foo[Int]]
-  No C of Foo[Int]
-
+t2462c.scala:32: error: No C of Foo[Int]
   f[Foo[Int]]
    ^
-t2462c.scala:35: error: implicit error;
-!I theC: C[Foo[Int]]
-  No C of Foo[Int]
-
+t2462c.scala:35: error: No C of Foo[Int]
   g[Foo[Int]]
    ^
-t2462c.scala:38: error: implicit error;
-!I theC: C[Foo[Int]]
-  I see no C[Foo[Int]]
-
+t2462c.scala:38: error: I see no C[Foo[Int]]
   h[Foo[Int]]
    ^
-t2462c.scala:42: error: implicit error;
-!I i: Int
-  String List [?T0, ZZ] -> List[C[_]] Int Option[Long] -- .
-
+t2462c.scala:42: error: String List [?T0, ZZ] -> List[C[_]] Int Option[Long] -- .
   i.m[Option[Long]]
      ^
 5 errors
diff --git a/test/files/neg/t3346b.check b/test/files/neg/t3346b.check
index 28457b516ed8..cf740736a799 100644
--- a/test/files/neg/t3346b.check
+++ b/test/files/neg/t3346b.check
@@ -1,5 +1,4 @@
-t3346b.scala:14: error: implicit error;
-!I evidence$1: TC[Any]
+t3346b.scala:14: error: could not find implicit value for evidence parameter of type TC[Any]
   val y = foo(1)
              ^
 1 error
diff --git a/test/files/neg/t3399.check b/test/files/neg/t3399.check
index d037c16ea84e..112574b3ffe3 100644
--- a/test/files/neg/t3399.check
+++ b/test/files/neg/t3399.check
@@ -1,7 +1,4 @@
-t3399.scala:23: error: implicit error;
-!I e: Succ[Succ[_0]] =:= Succ[_0]
-  Cannot prove that Nats.Add[Nats._1,Nats._1] =:= Nats._1.
-
+t3399.scala:23: error: Cannot prove that Nats.Add[Nats._1,Nats._1] =:= Nats._1.
     implicitly[ Add[_1, _1] =:= _1]
               ^
 1 error
diff --git a/test/files/neg/t3507-old.check b/test/files/neg/t3507-old.check
index 1c88543129cf..d50ebfd9c984 100644
--- a/test/files/neg/t3507-old.check
+++ b/test/files/neg/t3507-old.check
@@ -1,7 +1,4 @@
-t3507-old.scala:13: error: implicit error;
-!I evidence$1: Manifest[c.type]
-  No Manifest available for _1.b.c.type.
-
+t3507-old.scala:13: error: No Manifest available for _1.b.c.type.
   mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier
                          ^
 1 error
diff --git a/test/files/neg/t3977.check b/test/files/neg/t3977.check
index 47aff47756b1..78249b09000f 100644
--- a/test/files/neg/t3977.check
+++ b/test/files/neg/t3977.check
@@ -1,5 +1,4 @@
-t3977.scala:12: error: implicit error;
-!I w: E
+t3977.scala:12: error: could not find implicit value for parameter w: False#If[E]
   new NoNull
   ^
 1 error
diff --git a/test/files/neg/t4079.check b/test/files/neg/t4079.check
index 721b5487e902..286151d1154e 100644
--- a/test/files/neg/t4079.check
+++ b/test/files/neg/t4079.check
@@ -1,5 +1,4 @@
-t4079_2.scala:2: error: implicit error;
-!I f: Functor[List[?]]
+t4079_2.scala:2: error: could not find implicit value for parameter f: Functor[List]
   Cat.compose[List,Option].Functor
                            ^
 1 error
diff --git a/test/files/neg/t4270.check b/test/files/neg/t4270.check
index add4696c201b..af56ada4fa57 100644
--- a/test/files/neg/t4270.check
+++ b/test/files/neg/t4270.check
@@ -1,5 +1,4 @@
-t4270.scala:5: error: implicit error;
-!I e: Int
+t4270.scala:5: error: could not find implicit value for parameter e: Int
   implicitly[Int]
             ^
 1 error
diff --git a/test/files/neg/t4889.check b/test/files/neg/t4889.check
index af65bfe69971..96e9b7528e67 100644
--- a/test/files/neg/t4889.check
+++ b/test/files/neg/t4889.check
@@ -1,5 +1,4 @@
-t4889.scala:19: error: implicit error;
-!I ma1: MatrixAdder[Int, SparseMatrix[?]]
+t4889.scala:19: error: could not find implicit value for parameter ma1: t4889.MatrixAdder[Int,[S]t4889.SparseMatrix[S]]
   m1.foo
      ^
 1 error
diff --git a/test/files/neg/t550.check b/test/files/neg/t550.check
index f6409def976a..e09b9cab03f7 100644
--- a/test/files/neg/t550.check
+++ b/test/files/neg/t550.check
@@ -1,8 +1,7 @@
 t550.scala:6: error: type List takes type parameters
   def sum[a](xs: List)(implicit m: Monoid[a]): a =
                  ^
-t550.scala:8: error: implicit error;
-!I m: Monoid[a]
+t550.scala:8: error: could not find implicit value for parameter m: Monoid[a]
   sum(List(1,2,3))
      ^
 2 errors
diff --git a/test/files/neg/t5553_2.check b/test/files/neg/t5553_2.check
index dff0e5b34a7e..b26c7f634f70 100644
--- a/test/files/neg/t5553_2.check
+++ b/test/files/neg/t5553_2.check
@@ -23,20 +23,16 @@ t5553_2.scala:41: error: type mismatch;
  required: Base[T]
   def test10[T]: Base[T] = Foo3[T]
                                ^
-t5553_2.scala:47: error: implicit error;
-!I z: String
+t5553_2.scala:47: error: could not find implicit value for parameter z: String
   def test13[T]: Int     = Foo3[T]
                                ^
-t5553_2.scala:48: error: implicit error;
-!I z: String
+t5553_2.scala:48: error: could not find implicit value for parameter z: String
   def test14[T]: Base[T] = Foo3[T]
                                ^
-t5553_2.scala:49: error: implicit error;
-!I z: String
+t5553_2.scala:49: error: could not find implicit value for parameter z: String
   def test15[T]: String = Foo3[T]
                               ^
-t5553_2.scala:50: error: implicit error;
-!I z: String
+t5553_2.scala:50: error: could not find implicit value for parameter z: String
   def test16[T]         = Foo3[T]
                               ^
 t5553_2.scala:54: error: ambiguous reference to overloaded definition,
diff --git a/test/files/neg/t5801.check b/test/files/neg/t5801.check
index 2a18a4f4c419..7f6cb4cfe6c3 100644
--- a/test/files/neg/t5801.check
+++ b/test/files/neg/t5801.check
@@ -8,8 +8,7 @@ t5801.scala:4: error: not found: value sth
 t5801.scala:7: error: not found: value sth
   def bar(x: Int)(implicit y: Int): sth.Sth = null
                                     ^
-t5801.scala:8: error: implicit error;
-!I y: Int
+t5801.scala:8: error: could not find implicit value for parameter y: Int
   bar(1)
      ^
 t5801.scala:10: error: not found: value sth
@@ -18,8 +17,7 @@ t5801.scala:10: error: not found: value sth
 t5801.scala:13: error: not found: value sth
   def meh2(x: Int)(implicit b: Int, a: sth.Sth): Unit = {}
                                        ^
-t5801.scala:14: error: implicit error;
-!I b: Int
+t5801.scala:14: error: could not find implicit value for parameter b: Int
   meh2(1)
       ^
 7 errors
diff --git a/test/files/neg/t5803.check b/test/files/neg/t5803.check
index 3481422c9a8f..54d348450455 100644
--- a/test/files/neg/t5803.check
+++ b/test/files/neg/t5803.check
@@ -1,5 +1,4 @@
-t5803.scala:3: error: implicit error;
-!I ev: Nothing
+t5803.scala:3: error: could not find implicit value for parameter ev: Nothing
   new Foo(): String
   ^
 1 error
diff --git a/test/files/neg/t6528.check b/test/files/neg/t6528.check
index 92699ca9dede..1c55fe568e98 100644
--- a/test/files/neg/t6528.check
+++ b/test/files/neg/t6528.check
@@ -1,5 +1,4 @@
-t6528.scala:6: error: implicit error;
-!I e: CoSet[U, Any]
+t6528.scala:6: error: could not find implicit value for parameter e: CoSet[U,Any]
   implicitly[CoSet[U, Any]]
             ^
 1 error
diff --git a/test/files/neg/t7289.check b/test/files/neg/t7289.check
index 08c114b20481..05dad641b93c 100644
--- a/test/files/neg/t7289.check
+++ b/test/files/neg/t7289.check
@@ -1,7 +1,4 @@
-t7289.scala:8: error: implicit error;
-!I e: Schtroumpf[Nil.type]
-Test.schtroumpf invalid because
-!I minorSchtroumpf: Schtroumpf[T]
+t7289.scala:8: error: could not find implicit value for parameter e: Test.Schtroumpf[Nil.type]
   implicitly[Schtroumpf[Nil.type]]
             ^
 1 error
diff --git a/test/files/neg/t7289_status_quo.check b/test/files/neg/t7289_status_quo.check
index bfc5a1b3b4f0..ca3c0124f001 100644
--- a/test/files/neg/t7289_status_quo.check
+++ b/test/files/neg/t7289_status_quo.check
@@ -1,13 +1,7 @@
-t7289_status_quo.scala:9: error: implicit error;
-!I e: Ext[List[Int]]
-Test1.f invalid because
-!I xi: Ext[A]
+t7289_status_quo.scala:9: error: could not find implicit value for parameter e: Test1.Ext[List[Int]]
   implicitly[Ext[List[Int]]]                    // fails - not found
             ^
-t7289_status_quo.scala:11: error: implicit error;
-!I e: Ext[List[List[List[Int]]]]
-Test1.f invalid because
-!I xi: Ext[A]
+t7289_status_quo.scala:11: error: could not find implicit value for parameter e: Test1.Ext[List[List[List[Int]]]]
   implicitly[Ext[List[List[List[Int]]]]]        // fails - not found
             ^
 t7289_status_quo.scala:15: error: ambiguous implicit values:
@@ -16,16 +10,13 @@ t7289_status_quo.scala:15: error: ambiguous implicit values:
  match expected type Test1.Ext[_ <: List[List[Int]]]
   implicitly[Ext[_ <: List[List[Int]]]]         // fails - ambiguous
             ^
-t7289_status_quo.scala:20: error: implicit error;
-!I e: ExtCov[List[Int]]
+t7289_status_quo.scala:20: error: could not find implicit value for parameter e: Test1.ExtCov[List[Int]]
   implicitly[ExtCov[List[Int]]]                 // fails - not found
             ^
-t7289_status_quo.scala:21: error: implicit error;
-!I e: ExtCov[List[List[Int]]]
+t7289_status_quo.scala:21: error: could not find implicit value for parameter e: Test1.ExtCov[List[List[Int]]]
   implicitly[ExtCov[List[List[Int]]]]           // fails - not found
             ^
-t7289_status_quo.scala:22: error: implicit error;
-!I e: ExtCov[List[List[List[Int]]]]
+t7289_status_quo.scala:22: error: could not find implicit value for parameter e: Test1.ExtCov[List[List[List[Int]]]]
   implicitly[ExtCov[List[List[List[Int]]]]]     // fails - not found
             ^
 6 errors
diff --git a/test/files/neg/t7509.check b/test/files/neg/t7509.check
index d5ad4222690c..03ec8ef282fa 100644
--- a/test/files/neg/t7509.check
+++ b/test/files/neg/t7509.check
@@ -6,8 +6,7 @@ t7509.scala:3: error: type mismatch;
  required: R
   crash(42)
         ^
-t7509.scala:3: error: implicit error;
-!I ev: R
+t7509.scala:3: error: could not find implicit value for parameter ev: R
   crash(42)
        ^
 3 errors
diff --git a/test/files/neg/t7686.check b/test/files/neg/t7686.check
index ec52b9695a68..2374f42bb7ec 100644
--- a/test/files/neg/t7686.check
+++ b/test/files/neg/t7686.check
@@ -1,19 +1,10 @@
-t7686.scala:10: error: implicit error;
-!I tt: TypeTag[In[_$1]]
-  No TypeTag available for Test.In[_]
-
+t7686.scala:10: error: No TypeTag available for Test.In[_]
   t1[In]; t2[In]; t3[In]; t4[In]
     ^
-t7686.scala:11: error: implicit error;
-!I tt: TypeTag[Co[_$1]]
-  No TypeTag available for Test.Co[_]
-
+t7686.scala:11: error: No TypeTag available for Test.Co[_]
   t1[Co]; t2[Co]; t3[Co]; t4[Co]
     ^
-t7686.scala:12: error: implicit error;
-!I tt: TypeTag[Cn[_$1]]
-  No TypeTag available for Test.Cn[_]
-
+t7686.scala:12: error: No TypeTag available for Test.Cn[_]
   t1[Cn]; t2[Cn]; t3[Cn]; t4[Cn]
     ^
 3 errors
diff --git a/test/files/neg/t8104.check b/test/files/neg/t8104.check
index f409bca11ec8..b781d95393dd 100644
--- a/test/files/neg/t8104.check
+++ b/test/files/neg/t8104.check
@@ -1,5 +1,4 @@
-Test_2.scala:20: error: implicit error;
-!I e: Generic.Aux[C, (Int,Int)]
+Test_2.scala:20: error: could not find implicit value for parameter e: Generic.Aux[Test.C,(Int, Int)]
   implicitly[Generic.Aux[C, (Int, Int)]]
             ^
 1 error
diff --git a/test/files/neg/t8291.check b/test/files/neg/t8291.check
index abd7fd042b7d..4667f890e640 100644
--- a/test/files/neg/t8291.check
+++ b/test/files/neg/t8291.check
@@ -1,13 +1,7 @@
-t8291.scala:5: error: implicit error;
-!I e: X[Int, String]
-  Could not find implicit for Int or String
-
+t8291.scala:5: error: Could not find implicit for Int or String
   implicitly[X[Int, String]]
             ^
-t8291.scala:6: error: implicit error;
-!I e: X[Int, String]
-  Could not find implicit for Int or String
-
+t8291.scala:6: error: Could not find implicit for Int or String
   implicitly[Z[String]]
             ^
 2 errors
diff --git a/test/files/neg/t8372.check b/test/files/neg/t8372.check
index 033f91f4e760..b89cf288c52d 100644
--- a/test/files/neg/t8372.check
+++ b/test/files/neg/t8372.check
@@ -1,13 +1,7 @@
-t8372.scala:7: error: implicit error;
-!I ct1: ClassTag[A1]
-  No ClassTag available for A1
-
+t8372.scala:7: error: No ClassTag available for A1
   def unzip[T1, T2](a: Array[(T1, T2)]) = a.unzip
                                             ^
-t8372.scala:9: error: implicit error;
-!I ct1: ClassTag[T1]
-  No ClassTag available for T1
-
+t8372.scala:9: error: No ClassTag available for T1
   def unzip3[T1, T2, T3](a: Array[(T1, T2, T3)]): (Array[T1], Array[T2], Array[T3]) = a.unzip3
                                                                                         ^
 2 errors
diff --git a/test/files/neg/t9041.check b/test/files/neg/t9041.check
index adee8b97e1f8..172d3a350cf5 100644
--- a/test/files/neg/t9041.check
+++ b/test/files/neg/t9041.check
@@ -1,5 +1,4 @@
-t9041.scala:11: error: implicit error;
-!I cellSetter: CellSetter[BigDecimal]
+t9041.scala:11: error: could not find implicit value for parameter cellSetter: CellSetter[scala.math.BigDecimal]
       def setCell(cell: Cell, data: math.BigDecimal): Unit = { cell.setCellValue(data) }
                                                                                 ^
 1 error
diff --git a/test/files/neg/t9717.check b/test/files/neg/t9717.check
index b08553b2dbda..29ea674e98a2 100644
--- a/test/files/neg/t9717.check
+++ b/test/files/neg/t9717.check
@@ -4,15 +4,13 @@ t9717.scala:2: error: ambiguous implicit values:
  match expected type Int
 class B(implicit F: Int) extends A({ implicit val v: Int = 1; implicitly[Int] }) // ambiguous
                                                                         ^
-t9717.scala:6: error: implicit error;
-!I e: Int
+t9717.scala:6: error: could not find implicit value for parameter e: Int
   def this() = this(implicitly[Int]) // neg
                               ^
 t9717.scala:7: error: not found: value f
   def this(s: String) = this(f) // neg (`this` is not in scope!)
                              ^
-t9717.scala:12: error: implicit error;
-!I e: Int
+t9717.scala:12: error: could not find implicit value for parameter e: Int
   def this() = { this(implicitly[Int]) } // not in scope (spec 5.3.1, scope which is in effect at the point of the enclosing class definition)
                                 ^
 4 errors
diff --git a/test/files/neg/t9960.check b/test/files/neg/t9960.check
index 90afd4a386e3..085665971bc4 100644
--- a/test/files/neg/t9960.check
+++ b/test/files/neg/t9960.check
@@ -1,12 +1,4 @@
-t9960.scala:27: error: implicit error;
-!I m:
-  NNN.Aux[
-    Reader
-    ,
-    FxAppend[Fx1[Task], Fx2[Validate, Reader]]
-    ,
-    Fx2[Task, Validate]
-  ]
+t9960.scala:27: error: could not find implicit value for parameter m: NNN.Aux[NNN.Reader,NNN.FxAppend[NNN.Fx1[NNN.Task],NNN.Fx2[NNN.Validate,NNN.Reader]],NNN.Fx2[NNN.Task,NNN.Validate]]
       val hhhh: Eff[Fx2[Task, Validate], Unit] = runReader(gggg)
                                                           ^
 1 error
diff --git a/test/files/run/typetags_without_scala_reflect_typetag_lookup.check b/test/files/run/typetags_without_scala_reflect_typetag_lookup.check
index 1f5806f88736..892784d1cf66 100644
--- a/test/files/run/typetags_without_scala_reflect_typetag_lookup.check
+++ b/test/files/run/typetags_without_scala_reflect_typetag_lookup.check
@@ -1,3 +1,2 @@
 
-pos: RangePosition(newSource1.scala, 455, 466, 471) implicit error;
-!I evidence$1: TypeTag[Int] ERROR
+pos: RangePosition(newSource1.scala, 455, 466, 471) could not find implicit value for evidence parameter of type reflect.runtime.package.universe.TypeTag[Int] ERROR
diff --git a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check
index 5a9a160570f9..d510c578afc6 100644
--- a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check
+++ b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check
@@ -1,5 +1,2 @@
 
-pos: RangePosition(newSource1.scala, 471, 479, 482) implicit error;
-!I m: Manifest[T]
-  No Manifest available for App.this.T.
-   ERROR
+pos: RangePosition(newSource1.scala, 471, 479, 482) No Manifest available for App.this.T. ERROR