Skip to content

Commit 0dea3d5

Browse files
committed
SI-4270 Rename implicits to avoid name clashes.
This will fail implicit search in the next commit.
1 parent 43ae825 commit 0dea3d5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ trait ContextErrors {
9090
import infer.setError
9191

9292
object TyperErrorGen {
93-
implicit val context0: Context = infer.getContext
93+
implicit val contextTyperErrorGen: Context = infer.getContext
9494

9595
def UnstableTreeError(tree: Tree) = {
9696
def addendum = {
@@ -637,7 +637,7 @@ trait ContextErrors {
637637

638638
object InferErrorGen {
639639

640-
implicit val context0 = getContext
640+
implicit val contextInferErrorGen = getContext
641641

642642
object PolyAlternativeErrorKind extends Enumeration {
643643
type ErrorType = Value
@@ -823,7 +823,7 @@ trait ContextErrors {
823823

824824
object NamerErrorGen {
825825

826-
implicit val context0 = context
826+
implicit val contextNamerErrorGen = context
827827

828828
object SymValidateErrors extends Enumeration {
829829
val ImplicitConstr, ImplicitNotTermOrClass, ImplicitAtToplevel,
@@ -858,7 +858,7 @@ trait ContextErrors {
858858
case CyclicReference(sym, info: TypeCompleter) =>
859859
issueNormalTypeError(tree, typer.cyclicReferenceMessage(sym, info.tree) getOrElse ex.getMessage())
860860
case _ =>
861-
context0.issue(TypeErrorWithUnderlyingTree(tree, ex))
861+
contextNamerErrorGen.issue(TypeErrorWithUnderlyingTree(tree, ex))
862862
}
863863
}
864864

0 commit comments

Comments
 (0)