summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/names-defaults-neg.check4
-rw-r--r--test/files/neg/names-defaults-neg.scala4
-rw-r--r--test/files/neg/t2866.check2
-rw-r--r--test/files/neg/t2866.scala2
4 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
index 2db24b6f32..a43bf66811 100644
--- a/test/files/neg/names-defaults-neg.check
+++ b/test/files/neg/names-defaults-neg.check
@@ -64,7 +64,7 @@ names-defaults-neg.scala:49: error: ambiguous reference to overloaded definition
both method g in object t7 of type (a: B)String
and method g in object t7 of type (a: C, b: Int*)String
match argument types (C)
- t7.g(new C()) // ambigous reference
+ t7.g(new C()) // ambiguous reference
^
names-defaults-neg.scala:53: error: parameter 'b' is already specified at parameter position 2
test5(a = 1, b = "dkjl", b = "dkj")
@@ -79,7 +79,7 @@ names-defaults-neg.scala:61: error: ambiguous reference to overloaded definition
both method f in object t8 of type (b: String, a: Int)String
and method f in object t8 of type (a: Int, b: Object)String
match argument types (a: Int,b: String) and expected result type Any
- println(t8.f(a = 0, b = "1")) // ambigous reference
+ println(t8.f(a = 0, b = "1")) // ambiguous reference
^
names-defaults-neg.scala:69: error: wrong number of arguments for pattern A1(x: Int,y: String)
A1() match { case A1(_) => () }
diff --git a/test/files/neg/names-defaults-neg.scala b/test/files/neg/names-defaults-neg.scala
index 042f73708c..a97b590bf2 100644
--- a/test/files/neg/names-defaults-neg.scala
+++ b/test/files/neg/names-defaults-neg.scala
@@ -46,7 +46,7 @@ object Test extends App {
def g(a: C, b: Int*) = "third"
def g(a: B) = "fourth"
}
- t7.g(new C()) // ambigous reference
+ t7.g(new C()) // ambiguous reference
// vararg
def test5(a: Int, b: String*) = a
@@ -58,7 +58,7 @@ object Test extends App {
def f(a: Int, b: Object) = "first"
def f(b: String, a: Int) = "second"
}
- println(t8.f(a = 0, b = "1")) // ambigous reference
+ println(t8.f(a = 0, b = "1")) // ambiguous reference
// case class copy does not exist if there's a vararg
diff --git a/test/files/neg/t2866.check b/test/files/neg/t2866.check
index 340fb8da22..bc0da7e355 100644
--- a/test/files/neg/t2866.check
+++ b/test/files/neg/t2866.check
@@ -5,7 +5,7 @@ t2866.scala:42: error: ambiguous implicit values:
both value two of type Int
and value one in object A of type => Int
match expected type Int
- assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambigous in 2.7.6
+ assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambiguous in 2.7.6
^
t2866.scala:50: error: ambiguous implicit values:
both value two of type Int
diff --git a/test/files/neg/t2866.scala b/test/files/neg/t2866.scala
index 55ebff9710..6be8bf9e89 100644
--- a/test/files/neg/t2866.scala
+++ b/test/files/neg/t2866.scala
@@ -39,7 +39,7 @@ object Test {
import A.one
assert(implicitly[Int] == 1)
implicit val two = 2
- assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambigous in 2.7.6
+ assert(implicitly[Int] == 2) // !!! Not ambiguous in 2.8.0. Ambiguous in 2.7.6
}
locally {