diff options
| author | Paul Phillips <paulp@improving.org> | 2011-09-19 20:46:22 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-09-19 20:46:22 +0000 |
| commit | c22bc18ab6a6b91c30a6e9dde6797d7db94e22e0 (patch) | |
| tree | b98c3f48f68fd575f6f41d1c986b990ce462dcee /src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | |
| parent | e21d9b0a3907ee59b4d05489ecaf0fbf6467e27f (diff) | |
| download | scala-c22bc18ab6a6b91c30a6e9dde6797d7db94e22e0.tar.gz scala-c22bc18ab6a6b91c30a6e9dde6797d7db94e22e0.tar.bz2 scala-c22bc18ab6a6b91c30a6e9dde6797d7db94e22e0.zip | |
Rooting out mismatched zips.
I added local logging to zip and zipped and listened for who was
dropping things on the floor. Everything in this commit stems from that.
Sometimes the fix was uncertain and I sprinkled some logging. If you've
been hanging back with lots of internals knowledge waiting for the right
commit to review, this would be a good one. But since knowledgeable
people are hard to find, I'll go with review by moors.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/RefChecks.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 68cc6db2fe..e2fb367d20 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -844,9 +844,11 @@ abstract class RefChecks extends InfoTransform with reflect.internal.transform.R } } validateVariance(pre, variance) - validateVarianceArgs(args, variance, sym.typeParams) //@M for higher-kinded typeref, args.isEmpty + // @M for higher-kinded typeref, args.isEmpty // However, these args respect variances by construction anyway // -- the interesting case is in type application, see checkKindBounds in Infer + if (args.nonEmpty) + validateVarianceArgs(args, variance, sym.typeParams) case ClassInfoType(parents, decls, symbol) => validateVariances(parents, variance) case RefinedType(parents, decls) => |