diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2012-06-04 19:44:42 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2012-06-09 08:50:31 +0200 |
| commit | 0dea3d5a05d838c9ad710cbcb14fbc6d83035851 (patch) | |
| tree | 13af29cf69d4a85f1ca9045113772fa6355655dd | |
| parent | 43ae8259f2e01393219d1ece0c87614eece32621 (diff) | |
| download | scala-0dea3d5a05d838c9ad710cbcb14fbc6d83035851.tar.gz scala-0dea3d5a05d838c9ad710cbcb14fbc6d83035851.tar.bz2 scala-0dea3d5a05d838c9ad710cbcb14fbc6d83035851.zip | |
SI-4270 Rename implicits to avoid name clashes.
This will fail implicit search in the next commit.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala index a2f0e053a8..960f85f612 100644 --- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala @@ -90,7 +90,7 @@ trait ContextErrors { import infer.setError object TyperErrorGen { - implicit val context0: Context = infer.getContext + implicit val contextTyperErrorGen: Context = infer.getContext def UnstableTreeError(tree: Tree) = { def addendum = { @@ -637,7 +637,7 @@ trait ContextErrors { object InferErrorGen { - implicit val context0 = getContext + implicit val contextInferErrorGen = getContext object PolyAlternativeErrorKind extends Enumeration { type ErrorType = Value @@ -823,7 +823,7 @@ trait ContextErrors { object NamerErrorGen { - implicit val context0 = context + implicit val contextNamerErrorGen = context object SymValidateErrors extends Enumeration { val ImplicitConstr, ImplicitNotTermOrClass, ImplicitAtToplevel, @@ -858,7 +858,7 @@ trait ContextErrors { case CyclicReference(sym, info: TypeCompleter) => issueNormalTypeError(tree, typer.cyclicReferenceMessage(sym, info.tree) getOrElse ex.getMessage()) case _ => - context0.issue(TypeErrorWithUnderlyingTree(tree, ex)) + contextNamerErrorGen.issue(TypeErrorWithUnderlyingTree(tree, ex)) } } |