diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2011-11-23 14:14:34 -0500 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2011-11-23 14:14:34 -0500 |
| commit | 26aee7eb070ae35984be1d0c3d3b02d4909a6e26 (patch) | |
| tree | 2448b2ee277b4a3bfd1df64e5b3e7eb02138ac32 /test/files/run/constrained-types.check | |
| parent | b7b81ca286b1f426cd19befd50fbc513bb82282f (diff) | |
| download | scala-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/run/constrained-types.check')
| -rw-r--r-- | test/files/run/constrained-types.check | 4 |
1 files changed, 2 insertions, 2 deletions
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 |