diff options
| author | Paul Phillips <paulp@improving.org> | 2012-08-18 21:22:36 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-08-18 21:22:36 -0700 |
| commit | d46818e4e1d405829312b0d9029b35148ae13b3b (patch) | |
| tree | b6ac04b9bba5fb59e8e5ef9c69bd5c65244fbdc4 | |
| parent | 9070cb7248a49eab7693779c79bbe73beaccb639 (diff) | |
| parent | bef9b2ae3d45353ed3660462d5e5eb6c7a641ffa (diff) | |
| download | scala-d46818e4e1d405829312b0d9029b35148ae13b3b.tar.gz scala-d46818e4e1d405829312b0d9029b35148ae13b3b.tar.bz2 scala-d46818e4e1d405829312b0d9029b35148ae13b3b.zip | |
Merge pull request #1162 from paulp/aug19-scala-graph
Fix for community build blocker.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Infer.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/hk-match/a.scala | 5 | ||||
| -rw-r--r-- | test/files/pos/hk-match/b.scala | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala index 7016474a90..b502af4a7f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala @@ -1372,7 +1372,7 @@ trait Infer { ( isLocalBinding(sym) || arg.typeSymbol.isTypeParameterOrSkolem || (sym.name == tpnme.WILDCARD) // avoid spurious warnings on HK types - || check(arg, param.tpe, conforms) + || check(arg, param.tpeHK, conforms) || warn("non-variable type argument " + arg) ) } diff --git a/test/files/pos/hk-match/a.scala b/test/files/pos/hk-match/a.scala new file mode 100644 index 0000000000..7144068f3c --- /dev/null +++ b/test/files/pos/hk-match/a.scala @@ -0,0 +1,5 @@ +trait A { + type HKAlias[X] = List[X] + + (null: Any) match { case f: Bippy[HKAlias] => f } +} diff --git a/test/files/pos/hk-match/b.scala b/test/files/pos/hk-match/b.scala new file mode 100644 index 0000000000..f7d21f6383 --- /dev/null +++ b/test/files/pos/hk-match/b.scala @@ -0,0 +1 @@ +trait Bippy[E[X]] |