Merge pull request #4574 from janekdb/2.11.x-typos-g-i

Fix 25 typos (g-i)

8 files changed, 8 insertions, 8 deletions

diff --git a/test/files/run/blame_eye_triple_eee-double.check b/test/files/run/blame_eye_triple_eee-double.check
index 5e46d91a8f..53eac99ecd 100644
--- a/test/files/run/blame_eye_triple_eee-double.check
+++ b/test/files/run/blame_eye_triple_eee-double.check
@@ -6,4 +6,4 @@ if (x != x) is good
 if (NaN != x) is good
 x matching was good
 NaN matching was good
-loop with NaN was goood
+loop with NaN was good
diff --git a/test/files/run/blame_eye_triple_eee-double.scala b/test/files/run/blame_eye_triple_eee-double.scala
index 1640aead40..4dcbfe7a7a 100644
--- a/test/files/run/blame_eye_triple_eee-double.scala
+++ b/test/files/run/blame_eye_triple_eee-double.scala
@@ -56,6 +56,6 @@ object Test extends App {
     else z = NaN
     i += 1
   }
-  if (z.isNaN && i == 10) println("loop with NaN was goood")
+  if (z.isNaN && i == 10) println("loop with NaN was good")
   else println("loop with NaN was broken")
 }
diff --git a/test/files/run/blame_eye_triple_eee-float.check b/test/files/run/blame_eye_triple_eee-float.check
index 5e46d91a8f..53eac99ecd 100644
--- a/test/files/run/blame_eye_triple_eee-float.check
+++ b/test/files/run/blame_eye_triple_eee-float.check
@@ -6,4 +6,4 @@ if (x != x) is good
 if (NaN != x) is good
 x matching was good
 NaN matching was good
-loop with NaN was goood
+loop with NaN was good
diff --git a/test/files/run/blame_eye_triple_eee-float.scala b/test/files/run/blame_eye_triple_eee-float.scala
index 4deb9f3d60..bcc6b195d5 100644
--- a/test/files/run/blame_eye_triple_eee-float.scala
+++ b/test/files/run/blame_eye_triple_eee-float.scala
@@ -56,6 +56,6 @@ object Test extends App {
     else z = NaN
     i += 1
   }
-  if (z.isNaN && i == 10) println("loop with NaN was goood")
+  if (z.isNaN && i == 10) println("loop with NaN was good")
   else println("loop with NaN was broken")
 }
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
index c364425ec9..7fb4a04546 100644
--- a/test/files/run/names-defaults.scala
+++ b/test/files/run/names-defaults.scala
@@ -239,7 +239,7 @@ object Test extends App {
   // result type of default getters: parameter type, except if this one mentions any type
   // parameter, in which case the result type is inferred. examples:
 
-  // result type of default getter is "String => String". if it were infered, the compiler
+  // result type of default getter is "String => String". if it were inferred, the compiler
   // would put "Nothing => Nothing", which is useless
   def transform(s: String, f: String => String = identity _) = f(s)
   println(transform("my text"))
diff --git a/test/files/run/t0631.scala b/test/files/run/t0631.scala
index c401ed31cb..8d672574ec 100644
--- a/test/files/run/t0631.scala
+++ b/test/files/run/t0631.scala
@@ -11,6 +11,6 @@ object Test extends App {
   case class Bar(x: Foo)
   val b = new Bar(new Foo)
 
-  // this should not call Foo.equals, but simply compare object identiy of b
+  // this should not call Foo.equals, but simply compare object identity of b
   println(b == b)
 }
diff --git a/test/files/run/t2526.scala b/test/files/run/t2526.scala
index 53f3059135..9f3c48ec61 100644
--- a/test/files/run/t2526.scala
+++ b/test/files/run/t2526.scala
@@ -38,7 +38,7 @@ object Test {
 
   /*
    * Checks foreach of `actual` goes over all the elements in `expected`
-   * We duplicate the method above because there is no common inteface between Traversable and
+   * We duplicate the method above because there is no common interface between Traversable and
    * Iterator and we want to avoid converting between collections to ensure that we test what
    * we mean to test.
    */
diff --git a/test/files/run/t7817-tree-gen.scala b/test/files/run/t7817-tree-gen.scala
index a8317fda6e..094c0d6289 100644
--- a/test/files/run/t7817-tree-gen.scala
+++ b/test/files/run/t7817-tree-gen.scala
@@ -1,6 +1,6 @@
 import scala.tools.partest._
 
-// Testing that `mkAttributedRef` doesn't incude the package object test.`package`,
+// Testing that `mkAttributedRef` doesn't include the package object test.`package`,
 // under joint and separate compilation.
 
 package testSep { class C { object O } }