diff options
| author | Paul Phillips <paulp@improving.org> | 2011-06-30 21:37:29 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-06-30 21:37:29 +0000 |
| commit | d782ab3246247a46607365d8c5e43b20ac211de3 (patch) | |
| tree | f887559d4c101a56035d3b1cf34097f7f4c7b98c | |
| parent | a1375bf437dccf5ade90823a5c8b65cb5d84874b (diff) | |
| download | scala-d782ab3246247a46607365d8c5e43b20ac211de3.tar.gz scala-d782ab3246247a46607365d8c5e43b20ac211de3.tar.bz2 scala-d782ab3246247a46607365d8c5e43b20ac211de3.zip | |
Having established that r25051 is not responsib...
Having established that r25051 is not responsible for the compilation
issue with scalaz, it is hereby restored. Review by moors.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 10 | ||||
| -rw-r--r-- | test/files/neg/t3507.check | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 3d5032a7c8..0cd96cba83 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -637,14 +637,8 @@ trait Namers { self: Analyzer => // This infers Foo.type instead of "object Foo" // See Infer#adjustTypeArgs for the polymorphic case. - // - // 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 (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 ab38280c1f..8e538e4a8b 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 object _1.b.c. +t3507.scala:13: error: No Manifest available for _1.b.c.type. mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier ^ one error found |