From 83c0929417261c900100b57c19d5172f4d5bf665 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sun, 12 Jun 2011 02:24:51 +0000 Subject: 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. --- src/compiler/scala/tools/nsc/typechecker/Namers.scala | 10 ++++++++-- test/files/neg/t3507.check | 2 +- 2 files changed, 9 insertions(+), 3 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 diff --git a/test/files/neg/t3507.check b/test/files/neg/t3507.check index 8e538e4a8b..ab38280c1f 100644 --- a/test/files/neg/t3507.check +++ b/test/files/neg/t3507.check @@ -1,4 +1,4 @@ -t3507.scala:13: error: No Manifest available for _1.b.c.type. +t3507.scala:13: error: No Manifest available for object _1.b.c. mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier ^ one error found -- cgit v1.2.3