summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
diff options
context:
space:
mode:
authorJanek Bogucki <janekdb@gmail.com>2015-07-17 16:38:44 +0100
committerJanek Bogucki <janekdb@gmail.com>2015-07-17 17:18:51 +0100
commit57d377955b97623c45fa7d08fe94df0cc0263c9f (patch)
treed5ba231317054ac4c9820512305b77b72bc936f6 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala
parentf2e055f251d8c7169e8a84246d62d923fbcc8524 (diff)
downloadscala-57d377955b97623c45fa7d08fe94df0cc0263c9f.tar.gz
scala-57d377955b97623c45fa7d08fe94df0cc0263c9f.tar.bz2
scala-57d377955b97623c45fa7d08fe94df0cc0263c9f.zip
Fix typo in val name
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala4
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 11984da0d7..7ec9cd74a4 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -1361,7 +1361,7 @@ trait Implicits {
val succstart = if (stats) Statistics.startTimer(oftypeSucceedNanos) else null
// SI-6667, never search companions after an ambiguous error in in-scope implicits
- val wasAmbigious = result.isAmbiguousFailure
+ val wasAmbiguous = result.isAmbiguousFailure
// TODO: encapsulate
val previousErrs = context.reporter.errors
@@ -1371,7 +1371,7 @@ trait Implicits {
// `materializeImplicit` does some preprocessing for `pt`
// is it only meant for manifests/tags or we need to do the same for `implicitsOfExpectedType`?
- if (result.isFailure && !wasAmbigious)
+ if (result.isFailure && !wasAmbiguous)
result = searchImplicit(implicitsOfExpectedType, isLocalToCallsite = false)
if (result.isFailure)