summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2011-11-23 14:14:34 -0500
committerJosh Suereth <joshua.suereth@gmail.com>2011-11-23 14:14:34 -0500
commit26aee7eb070ae35984be1d0c3d3b02d4909a6e26 (patch)
tree2448b2ee277b4a3bfd1df64e5b3e7eb02138ac32 /test/files/neg
parentb7b81ca286b1f426cd19befd50fbc513bb82282f (diff)
downloadscala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.gz
scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.bz2
scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.zip
Added *.log and build/ to gitignore so partest/...
Added *.log and build/ to gitignore so partest/ant artifacts don't show up in our commit messages. Also fixed whitespace issues arising from the filter-branch history rewrite for git move.
Diffstat (limited to 'test/files/neg')
-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
11 files changed, 15 insertions, 15 deletions
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]