diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-01 11:42:55 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-01 11:42:55 +0200 |
| commit | faa32647ac69305dd2b111ca18b3f7fa2b948a49 (patch) | |
| tree | e17631be330ae74b872e53a979dc83691f4f4796 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 00b5adfbf3618639b501d1859f7a023083a4b8c3 (diff) | |
| parent | e596d1a65d81a81a54847d90d2d90be3ffbb3d92 (diff) | |
| download | scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.tar.gz scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.tar.bz2 scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.zip | |
Merge pull request #4480 from retronym/merge/2.11.x-to-2.12.x-20150501
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 010b924ba0..8b792998d4 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -4288,7 +4288,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper val selector1 = atPos(tree.pos.focusStart) { if (arity == 1) ids.head else gen.mkTuple(ids) } // SI-8120 If we don't duplicate the cases, the original Match node will share trees with ones that // receive symbols owned by this function. However if, after a silent mode session, we discard - // this Function and try a different approach (e.g. applying a view to the reciever) we end up + // this Function and try a different approach (e.g. applying a view to the receiver) we end up // with orphaned symbols which blows up far down the pipeline (or can be detected with -Ycheck:typer). val body = treeCopy.Match(tree, selector1, (cases map duplicateAndKeepPositions).asInstanceOf[List[CaseDef]]) typed1(atPos(tree.pos) { Function(params, body) }, mode, pt) |