summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-06-29 12:14:05 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-06-29 12:14:05 +1000
commit04e7448d42492c0f35a42c69cbac41a8cdff724e (patch)
treebb02c70f8451106212bdff5b06f574b68cdf59f8 /src/compiler
parent1b25705c662aba04cdd3d16b790963856b16206b (diff)
parent0ff6c81dd3e3e3a60d8f2db845ada167c8266395 (diff)
downloadscala-04e7448d42492c0f35a42c69cbac41a8cdff724e.tar.gz
scala-04e7448d42492c0f35a42c69cbac41a8cdff724e.tar.bz2
scala-04e7448d42492c0f35a42c69cbac41a8cdff724e.zip
Merge pull request #4589 from janekdb/2.11.x-method-names-m-o
Improve method names (m-o)
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/PatternTypers.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternTypers.scala b/src/compiler/scala/tools/nsc/typechecker/PatternTypers.scala
index 8a66c7d274..a702b3cdf5 100644
--- a/src/compiler/scala/tools/nsc/typechecker/PatternTypers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/PatternTypers.scala
@@ -305,7 +305,7 @@ trait PatternTypers {
// clearing the type is necessary so that ref will be stabilized; see bug 881
val fun1 = typedPos(fun.pos)(Apply(Select(fun.clearType(), unapplyMethod), unapplyArgTree :: Nil))
- def makeTypedUnApply() = {
+ def makeTypedUnapply() = {
// the union of the expected type and the inferred type of the argument to unapply
val glbType = glb(ensureFullyDefined(pt) :: unapplyArg.tpe_* :: Nil)
val wrapInTypeTest = canRemedy && !(fun1.symbol.owner isNonBottomSubClass ClassTagClass)
@@ -325,7 +325,7 @@ trait PatternTypers {
if (isBlackbox(unapplyMethod)) duplErrorTree(BlackboxExtractorExpansion(tree))
else duplErrorTree(WrongShapeExtractorExpansion(tree))
} else
- makeTypedUnApply()
+ makeTypedUnapply()
}
def wrapClassTagUnapply(uncheckedPattern: Tree, classTagExtractor: Tree, pt: Type): Tree = {