summaryrefslogtreecommitdiff
path: root/test/files/neg/t2918.check
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/t2918.check
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/t2918.check')
-rw-r--r--test/files/neg/t2918.check6
1 files changed, 3 insertions, 3 deletions
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