diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-10-06 10:44:57 +0000 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-10-06 10:44:57 +0000 |
commit | 7f2eaea3e7f08c6fcb53b6c7d7f35bbb4a82ebf5 (patch) | |
tree | a4fdb4b6811463870547ca93ab02b9135db4faab | |
parent | 5da791d8c4987d4fa532985d451e3a9369a85556 (diff) | |
download | scala-7f2eaea3e7f08c6fcb53b6c7d7f35bbb4a82ebf5.tar.gz scala-7f2eaea3e7f08c6fcb53b6c7d7f35bbb4a82ebf5.tar.bz2 scala-7f2eaea3e7f08c6fcb53b6c7d7f35bbb4a82ebf5.zip |
fixed #2421: checkBounds in typedImplicit0 to f...
fixed #2421: checkBounds in typedImplicit0 to filter out implicit
searchresults that result in nonsenical type instantiations
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 1 | ||||
-rw-r--r-- | test/files/pos/t2421.scala (renamed from test/pending/pos/t2421.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/t2421_delitedsl.scala (renamed from test/pending/pos/t2421_delitedsl.scala) | 0 |
3 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 2289d12617..d2498741f3 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -337,6 +337,7 @@ self: Analyzer => if (traceImplicits) println("tvars = "+tvars+"/"+(tvars map (_.constr))) val targs = solvedTypes(tvars, undetParams, undetParams map varianceInType(pt), false, lubDepth(List(itree2.tpe, pt))) + checkBounds(itree2.pos, NoPrefix, NoSymbol, undetParams, targs, "inferred ") // #2421 val subst = new TreeTypeSubstituter(undetParams, targs) subst traverse itree2 // todo: remove type params that have been instantiated to Nothing, similar diff --git a/test/pending/pos/t2421.scala b/test/files/pos/t2421.scala index 0d01be29fc..0d01be29fc 100644 --- a/test/pending/pos/t2421.scala +++ b/test/files/pos/t2421.scala diff --git a/test/pending/pos/t2421_delitedsl.scala b/test/files/pos/t2421_delitedsl.scala index a05887023a..a05887023a 100644 --- a/test/pending/pos/t2421_delitedsl.scala +++ b/test/files/pos/t2421_delitedsl.scala |