diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 | ||||
| -rw-r--r-- | test/files/buildmanager/t2790/t2790.check | 2 | ||||
| -rw-r--r-- | test/files/neg/names-defaults-neg.check | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 0311d3e53c..1a3f270c9a 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2313,7 +2313,7 @@ trait Typers { self: Analyzer => val (allArgs, missing) = addDefaults(args, qual, targs, previousArgss, params, fun.pos.focus, context) if (allArgs.length == formals.length) { // useful when a default doesn't match parameter type, e.g. def f[T](x:T="a"); f[Int]() - context.diagnostic = "Error occured in an application involving default arguments." :: context.diagnostic + context.diagnostic = "Error occurred in an application involving default arguments." :: context.diagnostic doTypedApply(tree, if (blockIsEmpty) fun else fun1, allArgs, mode, pt) } else { tryTupleApply.getOrElse { diff --git a/test/files/buildmanager/t2790/t2790.check b/test/files/buildmanager/t2790/t2790.check index 065956765a..3a57d28817 100644 --- a/test/files/buildmanager/t2790/t2790.check +++ b/test/files/buildmanager/t2790/t2790.check @@ -9,6 +9,6 @@ compiling Set(B.scala) B.scala:2: error: type mismatch; found : Int(5) required: String -Error occured in an application involving default arguments. +Error occurred in an application involving default arguments. val y = A.x(5) ^ diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check index 39347cd5db..644aad4a89 100644 --- a/test/files/neg/names-defaults-neg.check +++ b/test/files/neg/names-defaults-neg.check @@ -90,7 +90,7 @@ names-defaults-neg.scala:76: error: no type parameters for method test4: (x: T[T argument expression's type is not compatible with formal parameter type; found : List[Int] required: ?T[ ?T[ scala.List[?T[ X forSome { type X } ]] ] ] -Error occured in an application involving default arguments. +Error occurred in an application involving default arguments. test4() ^ names-defaults-neg.scala:79: error: type mismatch; @@ -101,7 +101,7 @@ names-defaults-neg.scala:79: error: type mismatch; names-defaults-neg.scala:82: error: type mismatch; found : Int required: String -Error occured in an application involving default arguments. +Error occurred in an application involving default arguments. new A2[String]() ^ 24 errors found |