Merge pull request #3051 from retronym/merge/2.10.x-to-master-4

Merge 2.10.x to master (again)

3 files changed, 0 insertions, 50 deletions

diff --git a/test/files/neg/t7020.check b/test/files/neg/t7020.check
deleted file mode 100644
index f9600ca7fc..0000000000
--- a/test/files/neg/t7020.check
+++ /dev/null
@@ -1,19 +0,0 @@
-t7020.scala:3: warning: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
-  List(5) match {
-      ^
-t7020.scala:10: warning: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
-  List(5) match {
-      ^
-t7020.scala:17: warning: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
-  List(5) match {
-      ^
-t7020.scala:24: warning: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
-  List(5) match {
-      ^
-error: No warnings can be incurred under -Xfatal-warnings.
-four warnings found
-one error found
diff --git a/test/files/neg/t7020.flags b/test/files/neg/t7020.flags
deleted file mode 100644
index e8fb65d50c..0000000000
--- a/test/files/neg/t7020.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/neg/t7020.scala b/test/files/neg/t7020.scala
deleted file mode 100644
index cc5421bab1..0000000000
--- a/test/files/neg/t7020.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-object Test {
-  // warning was non-deterministic
-  List(5) match {
-    case 1 :: Nil | 2 :: Nil  =>
-    case (x@(4 | 5 | 6)) :: Nil =>
-    case 7 :: Nil  =>
-    case Nil =>
-  }
-
-  List(5) match {
-    case 1 :: Nil | 2 :: Nil  =>
-    case (x@(4 | 5 | 6)) :: Nil =>
-    case 7 :: Nil  =>
-    case Nil =>
-  }
-
-  List(5) match {
-    case 1 :: Nil | 2 :: Nil  =>
-    case (x@(4 | 5 | 6)) :: Nil =>
-    case 7 :: Nil  =>
-    case Nil =>
-  }
-
-  List(5) match {
-    case 1 :: Nil | 2 :: Nil  =>
-    case (x@(4 | 5 | 6)) :: Nil =>
-    case 7 :: Nil  =>
-    case Nil =>
-  }
-}