diff options
| author | Michał Pociecha <michal.pociecha@gmail.com> | 2015-06-17 11:46:31 +0200 |
|---|---|---|
| committer | Janek Bogucki <janekdb@gmail.com> | 2015-06-18 08:43:47 +0100 |
| commit | 2dcc4c42fdcefee08add9dbdcf619ab5da745674 (patch) | |
| tree | 2b5bc8ef35660b8b53d5a8340b12f9fcce62e54f /test | |
| parent | ce7d2e95ce1f2bc6e601fb31f4c1fefa39d0d222 (diff) | |
| download | scala-2dcc4c42fdcefee08add9dbdcf619ab5da745674.tar.gz scala-2dcc4c42fdcefee08add9dbdcf619ab5da745674.tar.bz2 scala-2dcc4c42fdcefee08add9dbdcf619ab5da745674.zip | |
Fix another several typos
I just used text search to check whether there are no more typos like
these corrected by janekdb, and by the way fixed also some other ones
which I saw.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/t2866.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t2866.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t6648.scala | 2 | ||||
| -rw-r--r-- | test/scaladoc/run/implicits-base.scala | 2 | ||||
| -rw-r--r-- | test/scaladoc/scalacheck/HtmlFactoryTest.scala | 2 |
5 files changed, 5 insertions, 5 deletions
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 { diff --git a/test/files/pos/t6648.scala b/test/files/pos/t6648.scala index 9593ebfee9..b8f24870cc 100644 --- a/test/files/pos/t6648.scala +++ b/test/files/pos/t6648.scala @@ -10,7 +10,7 @@ class Transformer { } object transformer1 extends Transformer { - // Adding explicit type arguments, or making the impilcit view + // Adding explicit type arguments, or making the implicit view // seqToNodeSeq explicit avoids the crash NodeSeq.foo { // These both avoid the crash: diff --git a/test/scaladoc/run/implicits-base.scala b/test/scaladoc/run/implicits-base.scala index 8f8652cdb3..ea87a670bb 100644 --- a/test/scaladoc/run/implicits-base.scala +++ b/test/scaladoc/run/implicits-base.scala @@ -94,7 +94,7 @@ object Test extends ScaladocModelTest { assert(isShadowed(conv._member("convToEnrichedA"))) assert(conv._member("convToEnrichedA").resultType.name == "Double") - // def convToNumericA: Double // enrichA1: no constraintsd + // def convToNumericA: Double // enrichA1: no constraints conv = B._conversion(A.qualifiedName + ".enrichA1") assert(conv.members.length == 1) assert(conv.constraints.length == 0) diff --git a/test/scaladoc/scalacheck/HtmlFactoryTest.scala b/test/scaladoc/scalacheck/HtmlFactoryTest.scala index 6a6b1f8901..578e0382eb 100644 --- a/test/scaladoc/scalacheck/HtmlFactoryTest.scala +++ b/test/scaladoc/scalacheck/HtmlFactoryTest.scala @@ -711,7 +711,7 @@ object Test extends Properties("HtmlFactory") { property("class") = files.get("com/example/p1/Clazz.html") match { case Some(node: scala.xml.Node) => { - property("implicit convertion") = + property("implicit conversion") = node.toString contains "<span class=\"modifier\">implicit </span>" property("gt4s") = |