Update tests relating to inheritance of conflicting instantiations

Author: EugeneFlesselle

tests/neg/conflicting-inst-basetypes.scala

@@ -0,0 +1,7 @@
+
+object Test:
+  trait A[T]
+  trait B1 extends A[Int]
+  trait B2 extends A[String]
+  class D extends B1, B2 // error: cannot be instantiated since it has conflicting base types Test.A[Int] and Test.A[String]
+  // NOTE this is not accepted in Scala 2 either

tests/neg/i11103.scala

@@ -9,8 +9,4 @@
     case p: P =>
       new Foo // error
   }
-
-  class UpBndAndB extends UpBnd[Bar] with P
-  // ClassCastException: Foo cannot be cast to Bar
-  val x = pmatch(new UpBndAndB)
 }

tests/neg/i3989e.scala

@@ -1,6 +1,6 @@
 object Test extends App {
   trait A[+X](val x: X)
-  class B extends A(5) with A("hello") // error: A is extended twice
+  class B extends A(5) with A("hello") // error: A is extended twice // error: class B cannot be instantiated since it has conflicting base types Test.A[Int] and Test.A[String]
 
   def f(a: A[Int]): Int = a match {
     case b: B => b.x

tests/pos/templateParents.scala

@@ -14,8 +14,8 @@ object templateParents1 {
   trait D extends C[String]
   trait E extends C[Int]
 
-  val x = new D with E
+  trait P[T]
 
-  val y: C[Int & String] = x
+  val x = new D with P[Int]
 }