diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-08-21 17:23:12 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-08-21 17:23:12 +0000 |
| commit | 4a1b8bcc729e7817aa4017a7494f2c61fd7b7a22 (patch) | |
| tree | f548d7ccee4cf56db3f3ab17d435a064257c91f9 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | 163e4275ce6479fec2a04edac25e94cc176b8430 (diff) | |
| download | scala-4a1b8bcc729e7817aa4017a7494f2c61fd7b7a22.tar.gz scala-4a1b8bcc729e7817aa4017a7494f2c61fd7b7a22.tar.bz2 scala-4a1b8bcc729e7817aa4017a7494f2c61fd7b7a22.zip | |
in the end had to disable conforms as view in t...
in the end had to disable conforms as view in tryImplicit (see comment
in removeNames in NamesDefaults) fixed check file for viewtest added
newTermName for conforms to StdNames, so removed the previous weirdness
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index bce3c4a5ee..4fc19182ef 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -420,8 +420,8 @@ self: Analyzer => */ def tryImplicit(info: ImplicitInfo): SearchResult = if (containsError(info.tpe) || - (isLocal && shadowed.contains(info.name)) //|| - // (isView && (info.sym == Predef_identity || info.sym == Predef_conforms})) //@M this condition prevents no-op conversions, which are a problem (besides efficiency), + (isLocal && shadowed.contains(info.name)) || + (isView && (info.sym == Predef_conforms)) //@M this condition prevents no-op conversions, which are a problem (besides efficiency), // one example is removeNames in NamesDefaults, which relies on the type checker failing in case of ambiguity between an assignment/named arg ) SearchFailure else typedImplicit(info) |