diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:29:33 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:29:33 +1000 |
| commit | 8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6 (patch) | |
| tree | 9b91ee264a8a4abf936b4b2c939591decb751313 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | 020581e795a677b838fa62f67064fe9a55b02ba0 (diff) | |
| parent | 7b5998a0592ee707c02a13859fe1520687c76c38 (diff) | |
| download | scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.tar.gz scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.tar.bz2 scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150129
Conflicts:
build.number
src/library/scala/concurrent/Future.scala
versions.properties
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 7ed4fe1f88..4435ed0b60 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -3,7 +3,7 @@ * @author Martin Odersky */ -//todo: rewrite or disllow new T where T is a mixin (currently: <init> not a member of T) +//todo: rewrite or disallow new T where T is a mixin (currently: <init> not a member of T) //todo: use inherited type info also for vars and values //todo: disallow C#D in superclass //todo: treat :::= correctly @@ -159,7 +159,7 @@ trait Implicits { * @param tree The tree representing the implicit * @param subst A substituter that represents the undetermined type parameters * that were instantiated by the winning implicit. - * @param undetparams undeterminted type parameters + * @param undetparams undetermined type parameters */ class SearchResult(val tree: Tree, val subst: TreeTypeSubstituter, val undetparams: List[Symbol]) { override def toString = "SearchResult(%s, %s)".format(tree, |