diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | tests/pos/t0710.scala (renamed from tests/untried/pos/t0710.scala) | 0 | ||||
-rw-r--r-- | tests/pos/t0770.scala (renamed from tests/untried/pos/t0770.scala) | 0 | ||||
-rw-r--r-- | tests/pos/t0851.scala (renamed from tests/untried/pos/t0851.scala) | 2 | ||||
-rw-r--r-- | tests/pos/t0872.scala (renamed from tests/untried/pos/t0872.scala) | 0 | ||||
-rw-r--r-- | tests/pos/t0904.scala (renamed from tests/untried/pos/t0904.scala) | 0 | ||||
-rw-r--r-- | tests/pos/t0905.scala | 6 | ||||
-rw-r--r-- | tests/untried/pos/t0612/C.scala | 6 | ||||
-rw-r--r-- | tests/untried/pos/t0612/Ob.scala | 5 | ||||
-rw-r--r-- | tests/untried/pos/t0695/JavaClass.java | 5 | ||||
-rw-r--r-- | tests/untried/pos/t0695/Test.scala | 3 | ||||
-rw-r--r-- | tests/untried/pos/t0905.scala | 6 |
12 files changed, 8 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore index af401d568..90009066c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.class *.log +*~ # sbt specific dist/* diff --git a/tests/untried/pos/t0710.scala b/tests/pos/t0710.scala index d550d63f9..d550d63f9 100644 --- a/tests/untried/pos/t0710.scala +++ b/tests/pos/t0710.scala diff --git a/tests/untried/pos/t0770.scala b/tests/pos/t0770.scala index 7a0a2bf9b..7a0a2bf9b 100644 --- a/tests/untried/pos/t0770.scala +++ b/tests/pos/t0770.scala diff --git a/tests/untried/pos/t0851.scala b/tests/pos/t0851.scala index fcfdba51e..fdc504af7 100644 --- a/tests/untried/pos/t0851.scala +++ b/tests/pos/t0851.scala @@ -5,7 +5,7 @@ object test1 { def apply(t : T) = (s:T2) => f(t,s) def apply(p : (T,T2)) = f(p._1,p._2) } - implicit def g[T](f : (T,String) => String): test.test1.Foo[T,String] = Foo(f) + implicit def g[T](f : (T,String) => String): Foo[T, String] = Foo(f) def main(args : Array[String]) : Unit = { val f = (x:Int,s:String) => s + x println(f(1)) diff --git a/tests/untried/pos/t0872.scala b/tests/pos/t0872.scala index ccaee8052..ccaee8052 100644 --- a/tests/untried/pos/t0872.scala +++ b/tests/pos/t0872.scala diff --git a/tests/untried/pos/t0904.scala b/tests/pos/t0904.scala index 28ad30fc2..28ad30fc2 100644 --- a/tests/untried/pos/t0904.scala +++ b/tests/pos/t0904.scala diff --git a/tests/pos/t0905.scala b/tests/pos/t0905.scala new file mode 100644 index 000000000..3800c6e0b --- /dev/null +++ b/tests/pos/t0905.scala @@ -0,0 +1,6 @@ +object Test { + trait A[T] + def f(implicit p: A[_]) = null + implicit val x: A[_] = null + println(f) +} diff --git a/tests/untried/pos/t0612/C.scala b/tests/untried/pos/t0612/C.scala deleted file mode 100644 index 1f260a5b0..000000000 --- a/tests/untried/pos/t0612/C.scala +++ /dev/null @@ -1,6 +0,0 @@ -package test -package app - -class C { - Ob.f -} diff --git a/tests/untried/pos/t0612/Ob.scala b/tests/untried/pos/t0612/Ob.scala deleted file mode 100644 index d12e64963..000000000 --- a/tests/untried/pos/t0612/Ob.scala +++ /dev/null @@ -1,5 +0,0 @@ -package test - -object Ob { - protected[test] def f: Unit = {} -} diff --git a/tests/untried/pos/t0695/JavaClass.java b/tests/untried/pos/t0695/JavaClass.java deleted file mode 100644 index a765f7e32..000000000 --- a/tests/untried/pos/t0695/JavaClass.java +++ /dev/null @@ -1,5 +0,0 @@ -public class JavaClass<A> { - class InnerClass { - public A method() { return null; } - } -} diff --git a/tests/untried/pos/t0695/Test.scala b/tests/untried/pos/t0695/Test.scala deleted file mode 100644 index 7318867bf..000000000 --- a/tests/untried/pos/t0695/Test.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends JavaClass[AnyRef] { - var field: InnerClass = null -} diff --git a/tests/untried/pos/t0905.scala b/tests/untried/pos/t0905.scala deleted file mode 100644 index 8cd84759c..000000000 --- a/tests/untried/pos/t0905.scala +++ /dev/null @@ -1,6 +0,0 @@ -object Test { - trait A[T] - def f(implicit p: A[T] forSome { type T } ) = null - implicit val x: A[T] forSome { type T } = null - println(f) -} |