From f5ad8492d076051c8805370c05610d8294ccb241 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 27 Sep 2016 16:07:56 +0200 Subject: Fix reporting of ErrorTypes in highlighted segments --- tests/repl/errmsgs.check | 16 ++++++++-------- tests/repl/imports.check | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/repl/errmsgs.check b/tests/repl/errmsgs.check index b8cff5ba2..b791123f4 100644 --- a/tests/repl/errmsgs.check +++ b/tests/repl/errmsgs.check @@ -5,34 +5,34 @@ scala> val x: List[String] = List(1) 3:val x: List[String] = List(1) ^ found: Int(1) - required: String + required: Int(1) scala> val y: List[List[String]] = List(List(1)) -- [E006] Type Mismatch Error: ------------------------------------------------------------------------------- 3:val y: List[List[String]] = List(List(1)) ^ found: Int(1) - required: String + required: Int(1) scala> val z: (List[String], List[Int]) = (List(1), List("a")) -- [E006] Type Mismatch Error: ------------------------------------------------------------------------------- 3:val z: (List[String], List[Int]) = (List(1), List("a")) ^ found: Int(1) - required: String + required: Int(1) -- [E006] Type Mismatch Error: ------------------------------------------------------------------------------- 3:val z: (List[String], List[Int]) = (List(1), List("a")) ^^^ found: String("a") - required: Int + required: String("a") scala> val a: Inv[String] = new Inv(new Inv(1)) -- [E006] Type Mismatch Error: ------------------------------------------------------------------------------- 4:val a: Inv[String] = new Inv(new Inv(1)) ^^^^^ found: Inv[T] - required: String + required: Inv[T] where: T is a type variable with constraint >: Int(1) scala> val b: Inv[String] = new Inv(1) @@ -40,7 +40,7 @@ scala> val b: Inv[String] = new Inv(1) 4:val b: Inv[String] = new Inv(1) ^ found: Int(1) - required: String + required: Int(1) scala> abstract class C { type T @@ -61,7 +61,7 @@ scala> abstract class C { 8: var y: T = x ^ found: C.this.T(C.this.x) - required: T' + required: C.this.T(C.this.x) where: T is a type in class C T' is a type in the initalizer of value s which is an alias of String @@ -69,7 +69,7 @@ scala> abstract class C { 12: val z: T = y ^ found: T(y) - required: T' + required: T(y) where: T is a type in the initalizer of value s which is an alias of String T' is a type in method f which is an alias of Int diff --git a/tests/repl/imports.check b/tests/repl/imports.check index 2e8d5dcf9..817adae87 100644 --- a/tests/repl/imports.check +++ b/tests/repl/imports.check @@ -11,13 +11,13 @@ scala> buf += xs 10:buf += xs ^^ found: scala.collection.immutable.List[Int](o.xs) - required: String + required: scala.collection.immutable.List[Int](o.xs) -- [E006] Type Mismatch Error: ------------------------------------------------------------------------------- 10:buf += xs ^^^^^^^^^ found: String - required: scala.collection.mutable.ListBuffer[Int] + required: String scala> buf ++= xs res1: scala.collection.mutable.ListBuffer[Int] = ListBuffer(1, 2, 3) -- cgit v1.2.3