diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-11-02 14:34:35 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-11-02 14:34:35 +0000 |
commit | b6778be91900b8161e705dc2598ef7af86842b0b (patch) | |
tree | d15e8ec18a37eec212f50f1ace27714d7e7d4d34 /test/files/buildmanager | |
parent | ac6c76f26d884a94d0c9ff54f055d3f9ab750bac (diff) | |
download | scala-b6778be91900b8161e705dc2598ef7af86842b0b.tar.gz scala-b6778be91900b8161e705dc2598ef7af86842b0b.tar.bz2 scala-b6778be91900b8161e705dc2598ef7af86842b0b.zip |
Begone t1737...
Diffstat (limited to 'test/files/buildmanager')
-rw-r--r-- | test/files/buildmanager/freshnames/A.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/infer/A.scala | 2 | ||||
-rw-r--r-- | test/files/buildmanager/overloaded_1/A.scala | 2 | ||||
-rw-r--r-- | test/files/buildmanager/t2559/D.scala | 2 | ||||
-rw-r--r-- | test/files/buildmanager/t2562/A.scala | 2 | ||||
-rw-r--r-- | test/files/buildmanager/t2562/B.scala | 2 | ||||
-rw-r--r-- | test/files/buildmanager/t2562/t2562.changes/A2.scala | 2 | ||||
-rw-r--r-- | test/files/buildmanager/t3133/A.java | 6 |
8 files changed, 11 insertions, 11 deletions
diff --git a/test/files/buildmanager/freshnames/A.scala b/test/files/buildmanager/freshnames/A.scala index 88ea44b3c7..e8ab26ca1e 100644 --- a/test/files/buildmanager/freshnames/A.scala +++ b/test/files/buildmanager/freshnames/A.scala @@ -1,11 +1,11 @@ abstract class A { var t: List[B] - + def foo(n: String): Option[B] = { t.reverse find (_.names contains n) } - + def bar(n: Int): Option[B] = { t.reverse find (_.names contains n) } diff --git a/test/files/buildmanager/infer/A.scala b/test/files/buildmanager/infer/A.scala index 5e0e268122..46b5391609 100644 --- a/test/files/buildmanager/infer/A.scala +++ b/test/files/buildmanager/infer/A.scala @@ -1,5 +1,5 @@ class Foo(flag: Boolean) { - val classpath = + val classpath = if (flag) new AClasspath else diff --git a/test/files/buildmanager/overloaded_1/A.scala b/test/files/buildmanager/overloaded_1/A.scala index c070faf978..33b63b8006 100644 --- a/test/files/buildmanager/overloaded_1/A.scala +++ b/test/files/buildmanager/overloaded_1/A.scala @@ -3,7 +3,7 @@ trait As { override def foo = this /// Shouldn't cause the change override def foo(act: List[D]) = this } - + abstract class D{ def foo: D = this def foo(act: List[D]) = this diff --git a/test/files/buildmanager/t2559/D.scala b/test/files/buildmanager/t2559/D.scala index 4b8422db04..906b69a3e7 100644 --- a/test/files/buildmanager/t2559/D.scala +++ b/test/files/buildmanager/t2559/D.scala @@ -1,5 +1,5 @@ object D { - def x(a: A) = + def x(a: A) = a match { case _: B => () case _: C => () diff --git a/test/files/buildmanager/t2562/A.scala b/test/files/buildmanager/t2562/A.scala index 2208585eed..740cd1e868 100644 --- a/test/files/buildmanager/t2562/A.scala +++ b/test/files/buildmanager/t2562/A.scala @@ -1,6 +1,6 @@ object A { - def x0 = B.x0 + def x0 = B.x0 def x1 = B.x1 def x2 = B.x2 def x3 = 3 diff --git a/test/files/buildmanager/t2562/B.scala b/test/files/buildmanager/t2562/B.scala index 6f658954e1..a524e5cc84 100644 --- a/test/files/buildmanager/t2562/B.scala +++ b/test/files/buildmanager/t2562/B.scala @@ -1,6 +1,6 @@ object B { - def x0 = A.x1 + def x0 = A.x1 def x1 = A.x2 def x2 = A.x3 } diff --git a/test/files/buildmanager/t2562/t2562.changes/A2.scala b/test/files/buildmanager/t2562/t2562.changes/A2.scala index 743609eb18..c560e1e816 100644 --- a/test/files/buildmanager/t2562/t2562.changes/A2.scala +++ b/test/files/buildmanager/t2562/t2562.changes/A2.scala @@ -1,6 +1,6 @@ object A { - def x0 = B.x0 + def x0 = B.x0 def x1 = B.x1 def x2 = B.x2 def x3 = "3" diff --git a/test/files/buildmanager/t3133/A.java b/test/files/buildmanager/t3133/A.java index 9cf4d96bd4..c4e7f3af0e 100644 --- a/test/files/buildmanager/t3133/A.java +++ b/test/files/buildmanager/t3133/A.java @@ -1,7 +1,7 @@ public class A { - class Foo {} - + class Foo {} + public A(Foo a) {} - + private void bar(Foo z) {} } |