diff options
author | Michał Pociecha <michal.pociecha@gmail.com> | 2015-08-22 01:02:46 +0200 |
---|---|---|
committer | Michał Pociecha <michal.pociecha@gmail.com> | 2015-08-23 12:18:15 +0200 |
commit | 31ae74f2dd649bd67457492af6305b92a8ea9cf6 (patch) | |
tree | e15e154ff828e7ff80a16973605d0a6772a30d15 /test/files/neg | |
parent | f8a6d21a490090bac20b0753c46b91ca2b335049 (diff) | |
download | scala-31ae74f2dd649bd67457492af6305b92a8ea9cf6.tar.gz scala-31ae74f2dd649bd67457492af6305b92a8ea9cf6.tar.bz2 scala-31ae74f2dd649bd67457492af6305b92a8ea9cf6.zip |
Fix typos in spec, docs and comments
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/name-lookup-stable.check | 2 | ||||
-rw-r--r-- | test/files/neg/name-lookup-stable.scala | 2 | ||||
-rw-r--r-- | test/files/neg/t5376.scala | 2 | ||||
-rw-r--r-- | test/files/neg/t8597b.scala | 2 | ||||
-rw-r--r-- | test/files/neg/t8675b.scala | 2 | ||||
-rw-r--r-- | test/files/neg/virtpatmat_exhaust_compound.scala | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/name-lookup-stable.check b/test/files/neg/name-lookup-stable.check index 751df9505e..68d98c4162 100644 --- a/test/files/neg/name-lookup-stable.check +++ b/test/files/neg/name-lookup-stable.check @@ -6,6 +6,6 @@ import ColumnOption._ name-lookup-stable.scala:17: error: reference to PrimaryKey is ambiguous; it is both defined in class A and imported subsequently by import ColumnOption._ - PrimaryKey // was already ambigious in 2.10.3 + PrimaryKey // was already ambiguous in 2.10.3 ^ two errors found diff --git a/test/files/neg/name-lookup-stable.scala b/test/files/neg/name-lookup-stable.scala index 0d862f06e1..2941e05875 100644 --- a/test/files/neg/name-lookup-stable.scala +++ b/test/files/neg/name-lookup-stable.scala @@ -14,7 +14,7 @@ class A { (null: Any) match { case PrimaryKey => } - PrimaryKey // was already ambigious in 2.10.3 + PrimaryKey // was already ambiguous in 2.10.3 } } diff --git a/test/files/neg/t5376.scala b/test/files/neg/t5376.scala index 8da3868566..b1ba41bd54 100644 --- a/test/files/neg/t5376.scala +++ b/test/files/neg/t5376.scala @@ -12,7 +12,7 @@ object Test { "a": Int } - // Import one implict and one non-implicit method with the + // Import one implicit and one non-implicit method with the // same name in the same scope. def m2 = { import O1._ diff --git a/test/files/neg/t8597b.scala b/test/files/neg/t8597b.scala index b29d591cb1..cbf0bf1c5a 100644 --- a/test/files/neg/t8597b.scala +++ b/test/files/neg/t8597b.scala @@ -4,7 +4,7 @@ object Unchecked { // t is a fresh pattern type variable, despite our attempts to // backtick our way to the enclosing `t`. Under this interpretation, - // the absense of an unchecked warning is expected. + // the absence of an unchecked warning is expected. (null: Any) match { case _: Some[t] => // no warn } diff --git a/test/files/neg/t8675b.scala b/test/files/neg/t8675b.scala index bffed2141c..b2212fa234 100644 --- a/test/files/neg/t8675b.scala +++ b/test/files/neg/t8675b.scala @@ -9,7 +9,7 @@ object Test { } trait Reportable1[Params, R] - // "missing paramater type" error was swallowed in 2.11.0 leading to a crash + // "missing parameter type" error was swallowed in 2.11.0 leading to a crash // in the backend. // // This error is itself a regression (or at least a change) in 2.11.0-M7, diff --git a/test/files/neg/virtpatmat_exhaust_compound.scala b/test/files/neg/virtpatmat_exhaust_compound.scala index 386c7af98d..4ff04dd06a 100644 --- a/test/files/neg/virtpatmat_exhaust_compound.scala +++ b/test/files/neg/virtpatmat_exhaust_compound.scala @@ -10,7 +10,7 @@ case object O3 extends Base2 case object O4 extends Base with Base2 object Test { - val a /*: Product with Serialiable with Base */ = if (true) O1 else O2 + val a /*: Product with Serializable with Base */ = if (true) O1 else O2 a match { case null => } |