summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2017-04-10 11:06:29 -0500
committerGitHub <noreply@github.com>2017-04-10 11:06:29 -0500
commitf9514bb3ec70e63fa6a1ac65dd9d4e34a30529fe (patch)
tree6e2c010d98c98aaeb248d2889f759267f5bca6c3 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala
parentd9c3bd53433f202f0123733613baf3a382076323 (diff)
parenta23898e7e19c6d255c262f7465b8bc8c6e0b9b5d (diff)
downloadscala-f9514bb3ec70e63fa6a1ac65dd9d4e34a30529fe.tar.gz
scala-f9514bb3ec70e63fa6a1ac65dd9d4e34a30529fe.tar.bz2
scala-f9514bb3ec70e63fa6a1ac65dd9d4e34a30529fe.zip
Merge pull request #5786 from janekdb/topic/2.12.x-scaladoc-spelling-corrections-3
Fix Greek Mythology references in compiler package
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index 33e176a309..66ed0902d8 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -161,7 +161,7 @@ trait Implicits {
}
/* Map a polytype to one in which all type parameters and argument-dependent types are replaced by wildcards.
- * Consider `implicit def b(implicit x: A): x.T = error("")`. We need to approximate debruijn index types
+ * Consider `implicit def b(implicit x: A): x.T = error("")`. We need to approximate de Bruijn index types
* when checking whether `b` is a valid implicit, as we haven't even searched a value for the implicit arg `x`,
* so we have to approximate (otherwise it is excluded a priori).
*/
@@ -358,8 +358,8 @@ trait Implicits {
val undetParams = if (isView) Nil else context.outer.undetparams
val wildPt = approximate(pt)
- private val runDefintions = currentRun.runDefinitions
- import runDefintions._
+ private val stableRunDefsForImport = currentRun.runDefinitions
+ import stableRunDefsForImport._
def undet_s = if (undetParams.isEmpty) "" else undetParams.mkString(" inferring ", ", ", "")
def tree_s = typeDebug ptTree tree