Merge pull request #4622 from retronym/merge/2.11.x-to-2.12.x-20150713

Merge 2.11.x to 2.12.x [ci: last-only]

3 files changed, 5 insertions, 5 deletions

diff --git a/test/files/pos/t6601/UsePrivateValueClass_2.scala b/test/files/pos/t6601/UsePrivateValueClass_2.scala
index 461b8397b2..3b2b3dcc21 100644
--- a/test/files/pos/t6601/UsePrivateValueClass_2.scala
+++ b/test/files/pos/t6601/UsePrivateValueClass_2.scala
@@ -1,5 +1,5 @@
 object Test {
-	// After the first attempt to make seprately compiled value
+	// After the first attempt to make separately compiled value
 	// classes respect the privacy of constructors, we got:
 	//
 	//   exception when typing v.a().==(v.a())/class scala.reflect.internal.Trees$Apply
diff --git a/test/files/pos/t8111.scala b/test/files/pos/t8111.scala
index 0d63a16ba4..09463ce697 100644
--- a/test/files/pos/t8111.scala
+++ b/test/files/pos/t8111.scala
@@ -7,10 +7,10 @@ trait T {
     foo((u: Unit) => ma)
     foo(0, (u: Any) => ma) apply ()
 
-    // crash due to side effects on the onwer of the symbol in the 
+    // crash due to side effects on the owner of the symbol in the
     // qualifier or arguments of the application during an abandoned
-    // names/defaults transform. The code type checkes because of
-    // autp-tupling which promotes and empty parmater list to `(): Unit`
+    // names/defaults transform. The code type checks because of
+    // auto-tupling which promotes an empty parameter list to `(): Unit`
     foo((u: Any) => ma)()
     
     {{(u: Any) => ma}; this}.foo(0)()
diff --git a/test/files/pos/t8954/t2.scala b/test/files/pos/t8954/t2.scala
index 4def127832..c178486bc9 100644
--- a/test/files/pos/t8954/t2.scala
+++ b/test/files/pos/t8954/t2.scala
@@ -19,7 +19,7 @@ class C {
 }
 
 // 2.1 overriding with a deprecated def should be fine
-// and also shoudln't trigger the "deprecation is useless"
+// and also should not trigger the "deprecation is useless"
 // warning
 class D extends C {
   @deprecated("","") override def foo(): Unit = ???