summaryrefslogtreecommitdiff
path: root/test/files/run/t7319.check
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-08-24 11:36:36 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-08-24 11:36:36 +0200
commit3a543d64158e85b65f8998460c832362bdddec4f (patch)
tree665fc16d4932a6d8625fe28ae87c100bb1ee96c1 /test/files/run/t7319.check
parentcd77e23b76af8538ed7e2c5c90e7845582dff460 (diff)
parentded2d4f2e613aad6670b3e5dccbab0feb711b18b (diff)
downloadscala-3a543d64158e85b65f8998460c832362bdddec4f.tar.gz
scala-3a543d64158e85b65f8998460c832362bdddec4f.tar.bz2
scala-3a543d64158e85b65f8998460c832362bdddec4f.zip
Merge pull request #4700 from SethTisue/merge-2.11.x-aug-20
Merge 2.11.x aug 20 [ci: last-only]
Diffstat (limited to 'test/files/run/t7319.check')
-rw-r--r--test/files/run/t7319.check6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/run/t7319.check b/test/files/run/t7319.check
index 31923e7119..4d8429e8f2 100644
--- a/test/files/run/t7319.check
+++ b/test/files/run/t7319.check
@@ -15,21 +15,21 @@ warning: there was one feature warning; re-run with -feature for details
convert: [F[X <: F[X]]](builder: F[_ <: F[_]])Int
scala> convert(Some[Int](0))
-<console>:15: error: no type parameters for method convert: (builder: F[_ <: F[_]])Int exist so that it can be applied to arguments (Some[Int])
+<console>:16: error: no type parameters for method convert: (builder: F[_ <: F[_]])Int exist so that it can be applied to arguments (Some[Int])
--- because ---
argument expression's type is not compatible with formal parameter type;
found : Some[Int]
required: ?F[_$1] forSome { type _$1 <: ?F[_$2] forSome { type _$2 } }
convert(Some[Int](0))
^
-<console>:15: error: type mismatch;
+<console>:16: error: type mismatch;
found : Some[Int]
required: F[_ <: F[_]]
convert(Some[Int](0))
^
scala> Range(1,2).toArray: Seq[_]
-<console>:14: error: polymorphic expression cannot be instantiated to expected type;
+<console>:15: error: polymorphic expression cannot be instantiated to expected type;
found : [B >: Int]Array[B]
required: Seq[_]
Range(1,2).toArray: Seq[_]