Merge branch 'master' of https://github.com/scala/scala into wip-sip14-fixes

4 files changed, 3 insertions, 10 deletions

diff --git a/test/files/buildmanager/t2559/D.scala b/test/files/buildmanager/t2559/D.scala
index 906b69a3e7..62dc5427f9 100644
--- a/test/files/buildmanager/t2559/D.scala
+++ b/test/files/buildmanager/t2559/D.scala
@@ -1,8 +1,4 @@
 object D {
-  def x(a: A) = 
-    a match {
-      case _: B => ()
-      case _: C => ()
-    }
+  def x(a: A) = if (a.isInstanceOf[B] || a.isInstanceOf[C]) ()
 }
 
diff --git a/test/files/buildmanager/t2559/t2559.check b/test/files/buildmanager/t2559/t2559.check
index 752278fbe8..4d43838cf5 100644
--- a/test/files/buildmanager/t2559/t2559.check
+++ b/test/files/buildmanager/t2559/t2559.check
@@ -6,9 +6,4 @@ compiling Set(A.scala)
 Changes: Map(class B -> List(), class C -> List(), class E -> List(Changed(Class(A))[class E extends a sealed trait A]), trait A -> List())
 invalidate D.scala because it references changed class [Changed(Class(A))[class E extends a sealed trait A]]
 compiling Set(D.scala)
-D.scala:3: warning: match is not exhaustive!
-missing combination              E
-
-    a match {
-    ^
 Changes: Map(object D -> List())
diff --git a/test/files/buildmanager/t2650_1/t2650_1.check b/test/files/buildmanager/t2650_1/t2650_1.check
index ecddb33620..f1e4b1b8bc 100644
--- a/test/files/buildmanager/t2650_1/t2650_1.check
+++ b/test/files/buildmanager/t2650_1/t2650_1.check
@@ -1,5 +1,6 @@
 builder > A.scala B.scala
 compiling Set(A.scala, B.scala)
+warning: there were 1 feature warnings; re-run with -feature for details
 Changes: Map()
 builder > A.scala
 compiling Set(A.scala)
diff --git a/test/files/buildmanager/t2657/t2657.check b/test/files/buildmanager/t2657/t2657.check
index 74ba87a21d..cd0357599c 100644
--- a/test/files/buildmanager/t2657/t2657.check
+++ b/test/files/buildmanager/t2657/t2657.check
@@ -1,5 +1,6 @@
 builder > A.scala B.scala
 compiling Set(A.scala, B.scala)
+warning: there were 1 feature warnings; re-run with -feature for details
 Changes: Map()
 builder > A.scala
 compiling Set(A.scala)