summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Namers.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-06-12 02:24:51 +0000
committerPaul Phillips <paulp@improving.org>2011-06-12 02:24:51 +0000
commit83c0929417261c900100b57c19d5172f4d5bf665 (patch)
tree03bd9e2623183d7325cc33894e8a78b78180e256 /src/compiler/scala/tools/nsc/typechecker/Namers.scala
parent25d692b76fe30e31c9b51c93c1604d619a80b4d4 (diff)
downloadscala-83c0929417261c900100b57c19d5172f4d5bf665.tar.gz
scala-83c0929417261c900100b57c19d5172f4d5bf665.tar.bz2
scala-83c0929417261c900100b57c19d5172f4d5bf665.zip
Reverts r25051 due to witnessed movement of sca...
Reverts r25051 due to witnessed movement of scalaz in the noncompiling direction. Postmortem help I hope in the review by moors.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Namers.scala10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index c4c2316b4e..54054cb26c 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -637,8 +637,14 @@ trait Namers { self: Analyzer =>
// This infers Foo.type instead of "object Foo"
// See Infer#adjustTypeArgs for the polymorphic case.
- if (tpe.typeSymbolDirect.isModuleClass) tpe1
- else if (sym.isVariable || sym.isMethod && !sym.hasAccessorFlag)
+ //
+ // XXX - disabled for now due to impact on implicit search, visible
+ // when trying to compile scalaz. Example:
+ // scalaz/Each.scala:27: value toList is not a member of scalaz.Scalaz.IndSeq[A]
+ // def each[A](e: IndSeq[A], f: A => Unit) = e.toList foreach f
+ // if (tpe.typeSymbolDirect.isModuleClass) tpe1
+ // else
+ if (sym.isVariable || sym.isMethod && !sym.hasAccessorFlag)
if (tpe2 <:< pt) tpe2 else tpe1
else if (isHidden(tpe)) tpe2
// In an attempt to make pattern matches involving method local vals