diff options
| author | Paul Phillips <paulp@improving.org> | 2011-06-11 20:32:18 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-06-11 20:32:18 +0000 |
| commit | 8bba6eb9d36255754c183f805c4e283de8667da8 (patch) | |
| tree | 503259373550281228e364f6dc58244f007302d1 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | d73d4950c99dcd383408bfa6502bce592517825a (diff) | |
| download | scala-8bba6eb9d36255754c183f805c4e283de8667da8.tar.gz scala-8bba6eb9d36255754c183f805c4e283de8667da8.tar.bz2 scala-8bba6eb9d36255754c183f805c4e283de8667da8.zip | |
Tiark's main batch of optimizations to implicit...
Tiark's main batch of optimizations to implicit search. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index da07723b89..e30f69e858 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -1075,7 +1075,7 @@ trait Implicits { def findSubManifest(tp: Type) = findManifest(tp, if (full) FullManifestClass else OptManifestClass) def mot(tp0: Type, from: List[Symbol], to: List[Type]): SearchResult = { implicit def wrapResult(tree: Tree): SearchResult = - if (tree == EmptyTree) SearchFailure else new SearchResult(tree, new TreeTypeSubstituter(from, to)) + if (tree == EmptyTree) SearchFailure else new SearchResult(tree, if (from.isEmpty) EmptyTreeTypeSubstituter else new TreeTypeSubstituter(from, to)) val tp1 = tp0.normalize tp1 match { |