diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-13 12:23:30 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-13 12:23:30 -0800 |
| commit | 247939f857ce8f8fe5785cab549ee5f11df74f57 (patch) | |
| tree | 15b032c943a4271d6cd2f30d41b9ecf793a80812 | |
| parent | 43eb7a917faf679cb3f1d6dfe6f3685fc8d9f2af (diff) | |
| parent | 7db59bd9984dc66f41719a1e79d2d1443adc80ba (diff) | |
| download | scala-247939f857ce8f8fe5785cab549ee5f11df74f57.tar.gz scala-247939f857ce8f8fe5785cab549ee5f11df74f57.tar.bz2 scala-247939f857ce8f8fe5785cab549ee5f11df74f57.zip | |
Merge pull request #3258 from jrudolph/w/fix-typo-that-that-occurs-twice-in-error-messages
fix typo in error messages
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/t4928.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t6231.check | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 4eb8eb933c..6da971338f 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -1211,7 +1211,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { // See SI-6231 comments in LamdaLift for ideas on how to lift the restriction. val msg = sm"""Implementation restriction: local ${iface.fullLocationString} is unable to automatically capture the |free variable ${sym} on behalf of ${currentClass}. You can manually assign it to a val inside the trait, - |and refer that that val in ${currentClass}. For more details, see SI-6231.""" + |and refer to that val in ${currentClass}. For more details, see SI-6231.""" reporter.error(tree.pos, msg) } diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala index 2472f63993..719d04a7f9 100644 --- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala @@ -1261,7 +1261,7 @@ trait ContextErrors { def DoubleParamNamesDefaultError(arg: Tree, name: Name, pos: Int, otherName: Option[Name])(implicit context: Context) = { val annex = otherName match { - case Some(oName) => "\nNote that that '"+ oName +"' is not a parameter name of the invoked method." + case Some(oName) => "\nNote that '"+ oName +"' is not a parameter name of the invoked method." case None => "" } issueNormalTypeError(arg, "parameter '"+ name +"' is already specified at parameter position "+ pos + annex) diff --git a/test/files/neg/t4928.check b/test/files/neg/t4928.check index 06d4f22522..18a5d57a62 100644 --- a/test/files/neg/t4928.check +++ b/test/files/neg/t4928.check @@ -1,5 +1,5 @@ t4928.scala:3: error: parameter 'a' is already specified at parameter position 1 -Note that that 'z' is not a parameter name of the invoked method. +Note that 'z' is not a parameter name of the invoked method. f(z = 0, a = 1) ^ one error found diff --git a/test/files/neg/t6231.check b/test/files/neg/t6231.check index 2428bf66d0..6e107c97c7 100644 --- a/test/files/neg/t6231.check +++ b/test/files/neg/t6231.check @@ -1,6 +1,6 @@ t6231.scala:4: error: Implementation restriction: local trait Bug$X$1 is unable to automatically capture the free variable value ev$1 on behalf of <$anon: Function0>. You can manually assign it to a val inside the trait, -and refer that that val in <$anon: Function0>. For more details, see SI-6231. +and refer to that val in <$anon: Function0>. For more details, see SI-6231. def qux = { () => ev } ^ one error found |