summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
Diffstat (limited to 'test/files')
-rw-r--r--test/files/jvm/interpreter.check6
-rw-r--r--test/files/jvm/unittest_io_Jvm.check2
-rw-r--r--test/files/neg/gadts1.check2
-rw-r--r--test/files/neg/t0218.check2
-rw-r--r--test/files/neg/t112706A.check2
-rw-r--r--test/files/neg/t2870.check2
-rw-r--r--test/files/neg/t2918.check6
-rw-r--r--test/files/neg/t3015.check4
-rw-r--r--test/files/neg/t3776.check2
-rw-r--r--test/files/neg/t4217.check2
-rw-r--r--test/files/neg/t692.check2
-rw-r--r--test/files/neg/t693.check2
-rw-r--r--test/files/neg/variances.check4
-rw-r--r--test/files/run/constrained-types.check4
-rw-r--r--test/files/run/t4532.check6
-rw-r--r--test/files/run/t4671.check4
16 files changed, 26 insertions, 26 deletions
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check
index 607e2bcaff..ede74fb26f 100644
--- a/test/files/jvm/interpreter.check
+++ b/test/files/jvm/interpreter.check
@@ -73,7 +73,7 @@ fish: S = fish
scala> // Test that arrays pretty print nicely.
-scala> val arr = Array("What's", "up", "doc?")
+scala> val arr = Array("What's", "up", "doc?")
arr: Array[String] = Array(What's, up, doc?)
scala> // Test that arrays pretty print nicely, even when we give them type Any
@@ -338,10 +338,10 @@ You typed two blank lines. Starting a new command.
scala> // defining and using quoted names should work (ticket #323)
-scala> def `match` = 1
+scala> def `match` = 1
match: Int
-scala> val x = `match`
+scala> val x = `match`
x: Int = 1
scala>
diff --git a/test/files/jvm/unittest_io_Jvm.check b/test/files/jvm/unittest_io_Jvm.check
index d6e855f939..bcfce8cbdb 100644
--- a/test/files/jvm/unittest_io_Jvm.check
+++ b/test/files/jvm/unittest_io_Jvm.check
@@ -1,5 +1,5 @@
lines.size = 5
-
+
This is a file
it is split on several lines.
diff --git a/test/files/neg/gadts1.check b/test/files/neg/gadts1.check
index 44d2b114d6..f19b58c5db 100644
--- a/test/files/neg/gadts1.check
+++ b/test/files/neg/gadts1.check
@@ -1,7 +1,7 @@
gadts1.scala:15: error: type mismatch;
found : Test.Double
required: a
- case NumTerm(n) => c.x = Double(1.0)
+ case NumTerm(n) => c.x = Double(1.0)
^
gadts1.scala:20: error: class Cell of type Test.Cell does not take type parameters.
case Cell[a](x: Int) => c.x = 5
diff --git a/test/files/neg/t0218.check b/test/files/neg/t0218.check
index 6bb759156f..a22583d23b 100644
--- a/test/files/neg/t0218.check
+++ b/test/files/neg/t0218.check
@@ -1,4 +1,4 @@
t0218.scala:10: error: class type required but APQ.this.P found
- List(new PP)
+ List(new PP)
^
one error found
diff --git a/test/files/neg/t112706A.check b/test/files/neg/t112706A.check
index 30d0c3ec91..ad403ab134 100644
--- a/test/files/neg/t112706A.check
+++ b/test/files/neg/t112706A.check
@@ -1,6 +1,6 @@
t112706A.scala:5: error: constructor cannot be instantiated to expected type;
found : (T1, T2)
required: String
- case Tuple2(node,_) =>
+ case Tuple2(node,_) =>
^
one error found
diff --git a/test/files/neg/t2870.check b/test/files/neg/t2870.check
index 6577577d3f..759af53626 100644
--- a/test/files/neg/t2870.check
+++ b/test/files/neg/t2870.check
@@ -2,6 +2,6 @@ t2870.scala:1: error: not found: type Jar
class Jars(jar: Jar)
^
t2870.scala:6: error: illegal cyclic reference involving value <import>
- val scala = fromClasspathString(javaClassPath)
+ val scala = fromClasspathString(javaClassPath)
^
two errors found
diff --git a/test/files/neg/t2918.check b/test/files/neg/t2918.check
index 263beab518..aae3045e8a 100644
--- a/test/files/neg/t2918.check
+++ b/test/files/neg/t2918.check
@@ -1,10 +1,10 @@
t2918.scala:2: error: illegal cyclic reference involving type A
- def g[X, A[X] <: A[X]](x: A[X]) = x
+ def g[X, A[X] <: A[X]](x: A[X]) = x
^
t2918.scala:2: error: cyclic aliasing or subtyping involving type A
- def g[X, A[X] <: A[X]](x: A[X]) = x
+ def g[X, A[X] <: A[X]](x: A[X]) = x
^
t2918.scala:2: error: A does not take type parameters
- def g[X, A[X] <: A[X]](x: A[X]) = x
+ def g[X, A[X] <: A[X]](x: A[X]) = x
^
three errors found
diff --git a/test/files/neg/t3015.check b/test/files/neg/t3015.check
index 0b394e23d6..43ce1dc122 100644
--- a/test/files/neg/t3015.check
+++ b/test/files/neg/t3015.check
@@ -1,11 +1,11 @@
t3015.scala:7: error: scrutinee is incompatible with pattern type;
found : _$1 where type +_$1
required: String
- val b(foo) = "foo"
+ val b(foo) = "foo"
^
t3015.scala:7: error: type mismatch;
found : String with _$1(in object Test) where type +_$1(in object Test)
required: (some other)_$1(in object Test) where type +(some other)_$1(in object Test)
- val b(foo) = "foo"
+ val b(foo) = "foo"
^
two errors found
diff --git a/test/files/neg/t3776.check b/test/files/neg/t3776.check
index 4a5284cf0f..0dfe129596 100644
--- a/test/files/neg/t3776.check
+++ b/test/files/neg/t3776.check
@@ -1,4 +1,4 @@
t3776.scala:8: error: value someOperation is not a member of _$1
- def parsedAs[T](v: T) = MyParser.parse(pattern, a).get someOperation v
+ def parsedAs[T](v: T) = MyParser.parse(pattern, a).get someOperation v
^
one error found
diff --git a/test/files/neg/t4217.check b/test/files/neg/t4217.check
index e8cd5fd69e..6c49ec3354 100644
--- a/test/files/neg/t4217.check
+++ b/test/files/neg/t4217.check
@@ -1,4 +1,4 @@
t4217.scala:2: error: 'case' expected but '}' found.
- 42 match { }
+ 42 match { }
^
one error found
diff --git a/test/files/neg/t692.check b/test/files/neg/t692.check
index 12b7d40ba5..25dda7bd1b 100644
--- a/test/files/neg/t692.check
+++ b/test/files/neg/t692.check
@@ -11,7 +11,7 @@ t692.scala:13: error: class Foo takes type parameters
case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType);
^
t692.scala:14: error: class Foo takes type parameters
- implicit def typeOfBar[T4 <: Foo](implicit elem : RefType[T4]) : RefType[Bar[T4]] =
+ implicit def typeOfBar[T4 <: Foo](implicit elem : RefType[T4]) : RefType[Bar[T4]] =
^
t692.scala:15: error: type mismatch;
found : test3.this.BarType[T4]
diff --git a/test/files/neg/t693.check b/test/files/neg/t693.check
index 62325b5c60..25bd141501 100644
--- a/test/files/neg/t693.check
+++ b/test/files/neg/t693.check
@@ -1,4 +1,4 @@
t693.scala:4: error: x is already defined as value x
- val x : Int = 10;
+ val x : Int = 10;
^
one error found
diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check
index 4eaab56cef..b134a9a68c 100644
--- a/test/files/neg/variances.check
+++ b/test/files/neg/variances.check
@@ -1,8 +1,8 @@
variances.scala:4: error: covariant type A occurs in contravariant position in type test.Vector[A] of value x
- def append(x: Vector[A]): Vector[A]
+ def append(x: Vector[A]): Vector[A]
^
variances.scala:14: error: covariant type A occurs in contravariant position in type A of value a
- private[this] def setA(a : A) = this.a = a
+ private[this] def setA(a : A) = this.a = a
^
variances.scala:16: error: covariant type A occurs in invariant position in supertype test.C[A] with ScalaObject of object Baz
object Baz extends C[A]
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check
index ac8817cb08..963dd4a059 100644
--- a/test/files/run/constrained-types.check
+++ b/test/files/run/constrained-types.check
@@ -14,7 +14,7 @@ scala> class A {
val x = "hello"
val y: Int @Annot(x) = 10
override def toString = "an A"
-}
+}
defined class A
scala>
@@ -22,7 +22,7 @@ scala>
scala> val a = new A
a: A = an A
-scala> val y = a.y // should rewrite "this.x" to "a.x"
+scala> val y = a.y // should rewrite "this.x" to "a.x"
y: Int @Annot(a.x) = 10
scala> var a2 = new A
diff --git a/test/files/run/t4532.check b/test/files/run/t4532.check
index 47a9809248..018bbf2fa3 100644
--- a/test/files/run/t4532.check
+++ b/test/files/run/t4532.check
@@ -1,7 +1,7 @@
Type in expressions to have them evaluated.
Type :help for more information.
-scala>
+scala>
scala> object Bippy { class Dingus ; object Bop }
defined module Bippy
@@ -10,6 +10,6 @@ scala> :javap Bippy.Dingus
Compiled from "<console>"public class Bippy$Dingus extends java.lang.Object implements scala.ScalaObject{ public Bippy$Dingus();}
scala> :javap Bippy.Bop
Compiled from "<console>"public final class Bippy$Bop$ extends java.lang.Object implements scala.ScalaObject{ public static final Bippy$Bop$ MODULE$; public static {}; public Bippy$Bop$();}
-scala>
+scala>
-scala>
+scala>
diff --git a/test/files/run/t4671.check b/test/files/run/t4671.check
index 4699818cd4..797c0d8905 100644
--- a/test/files/run/t4671.check
+++ b/test/files/run/t4671.check
@@ -10,7 +10,7 @@ s: scala.io.BufferedSource = non-empty iterator
scala> println(s.getLines.mkString("\n"))
import scala.tools.partest.ReplTest
-object Test extends ReplTest {
+object Test extends ReplTest {
// My god...it's full of quines
def code = """
object o { val file = sys.props("partest.cwd") + "/t4671.scala" }
@@ -30,7 +30,7 @@ s: scala.io.BufferedSource = non-empty iterator
scala> println(s.mkString(""))
import scala.tools.partest.ReplTest
-object Test extends ReplTest {
+object Test extends ReplTest {
// My god...it's full of quines
def code = """
object o { val file = sys.props("partest.cwd") + "/t4671.scala" }
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 03:05:23 +0000