summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-12-13 12:23:30 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-12-13 12:23:30 -0800
commit247939f857ce8f8fe5785cab549ee5f11df74f57 (patch)
tree15b032c943a4271d6cd2f30d41b9ecf793a80812 /test
parent43eb7a917faf679cb3f1d6dfe6f3685fc8d9f2af (diff)
parent7db59bd9984dc66f41719a1e79d2d1443adc80ba (diff)
downloadscala-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
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t4928.check2
-rw-r--r--test/files/neg/t6231.check2
2 files changed, 2 insertions, 2 deletions
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