diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-18 11:12:50 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-02-18 16:41:00 -0800 |
| commit | 4223bc2ddc497457c7dccd1b9b65e98244a9b4d1 (patch) | |
| tree | 913115fd5918fb372a5fae8228820b59c7fe2350 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | bba01661ea629ff636a538226ad267a67d9dbfa7 (diff) | |
| download | scala-4223bc2ddc497457c7dccd1b9b65e98244a9b4d1.tar.gz scala-4223bc2ddc497457c7dccd1b9b65e98244a9b4d1.tar.bz2 scala-4223bc2ddc497457c7dccd1b9b65e98244a9b4d1.zip | |
SI-7788 Avoid accidental shadowing of Predef.conforms
Rename `conforms` to `$conforms` and put in a minimal backstop: pos/t7788.scala
TODO: predicate the backwards compatibility shim for `Predef_conforms`
on `-Xsource:2.10`
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 8f5778862d..42687fa7b1 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -807,7 +807,7 @@ trait Implicits { private def isIneligible(info: ImplicitInfo) = ( info.isCyclicOrErroneous - || isView && (info.sym eq Predef_conforms) + || isView && (info.sym eq Predef_conforms) // as an implicit conversion, Predef.$conforms is a no-op, so exclude it || (!context.macrosEnabled && info.sym.isTermMacro) ) |