diff options
| author | Seth Tisue <seth@tisue.net> | 2015-07-20 12:12:10 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-07-20 12:12:10 -0400 |
| commit | 8f2509e880b97ba18cf211fa6034d87f7ba1867a (patch) | |
| tree | 3e29de0e413f9f32b0530a02e47f96cdd4136443 /src/compiler | |
| parent | e84e06ca22c1fb77d3d4df82f322a8c6ee6c9569 (diff) | |
| parent | 57d377955b97623c45fa7d08fe94df0cc0263c9f (diff) | |
| download | scala-8f2509e880b97ba18cf211fa6034d87f7ba1867a.tar.gz scala-8f2509e880b97ba18cf211fa6034d87f7ba1867a.tar.bz2 scala-8f2509e880b97ba18cf211fa6034d87f7ba1867a.zip | |
Merge pull request #4643 from janekdb/2.11.x-names-w-z
Fix typo in val name
Diffstat (limited to 'src/compiler')
| -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 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) |