Merge branch 'master' into feature/pc-execution-contexts

1 files changed, 13 insertions, 0 deletions

diff --git a/test/files/neg/overloaded-unapply.check b/test/files/neg/overloaded-unapply.check
new file mode 100644
index 0000000000..1da93f6939
--- /dev/null
+++ b/test/files/neg/overloaded-unapply.check
@@ -0,0 +1,13 @@
+overloaded-unapply.scala:18: error: ambiguous reference to overloaded definition,
+both method unapply in object List of type [a](xs: List[a])Option[Null]
+and  method unapply in object List of type [a](xs: List[a])Option[(a, List[a])]
+match argument types (List[a])
+    case List(x, xs) => 7
+         ^
+overloaded-unapply.scala:22: error: cannot resolve overloaded unapply
+    case List(x, xs) => 7
+         ^
+overloaded-unapply.scala:12: error: method unapply is defined twice in overloaded-unapply.scala
+  def unapply[a](xs: List[a]): Option[Null] = xs match {
+      ^
+three errors found