diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-09-11 23:29:56 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-09-11 23:29:56 +0200 |
| commit | c3042e1ddbc53e11bb874a7aa57e417c980c93f6 (patch) | |
| tree | 6dfd083da1796320d48698b50d4915126721eada /test/files/run | |
| parent | 13c716eb45a09faf8853ea13207a48dbe8b59a19 (diff) | |
| parent | 9788e7a1f1809491154c2bcb47d3061b11c1d8a8 (diff) | |
| download | scala-c3042e1ddbc53e11bb874a7aa57e417c980c93f6.tar.gz scala-c3042e1ddbc53e11bb874a7aa57e417c980c93f6.tar.bz2 scala-c3042e1ddbc53e11bb874a7aa57e417c980c93f6.zip | |
Merge remote-tracking branch 'origin/master' into merge/2.10.x-to-master
Conflicts:
src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
Diffstat (limited to 'test/files/run')
| -rw-r--r-- | test/files/run/idempotency-partial-functions.check | 2 | ||||
| -rw-r--r-- | test/files/run/t4574.check | 2 | ||||
| -rw-r--r-- | test/files/run/t5353.check | 2 | ||||
| -rw-r--r-- | test/files/run/t6329_repl_bug.check | 13 | ||||
| -rw-r--r-- | test/files/run/t6329_vanilla_bug.check | 2 |
5 files changed, 0 insertions, 21 deletions
diff --git a/test/files/run/idempotency-partial-functions.check b/test/files/run/idempotency-partial-functions.check deleted file mode 100644 index 5c8a411655..0000000000 --- a/test/files/run/idempotency-partial-functions.check +++ /dev/null @@ -1,2 +0,0 @@ -error!! -error! diff --git a/test/files/run/t4574.check b/test/files/run/t4574.check deleted file mode 100644 index a4522fff24..0000000000 --- a/test/files/run/t4574.check +++ /dev/null @@ -1,2 +0,0 @@ -I hereby refute null! -I denounce null as unListLike! diff --git a/test/files/run/t5353.check b/test/files/run/t5353.check deleted file mode 100644 index a2906793ed..0000000000 --- a/test/files/run/t5353.check +++ /dev/null @@ -1,2 +0,0 @@ -1 -[Ljava.lang.Object; cannot be cast to [Ljava.lang.String; diff --git a/test/files/run/t6329_repl_bug.check b/test/files/run/t6329_repl_bug.check deleted file mode 100644 index 8663184bde..0000000000 --- a/test/files/run/t6329_repl_bug.check +++ /dev/null @@ -1,13 +0,0 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> classManifest[List[_]] -warning: there were 1 deprecation warnings; re-run with -deprecation for details -res0: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List[Any] - -scala> scala.reflect.classTag[List[_]] -res1: scala.reflect.ClassTag[List[_]] = scala.collection.immutable.List - -scala> diff --git a/test/files/run/t6329_vanilla_bug.check b/test/files/run/t6329_vanilla_bug.check deleted file mode 100644 index 8282afaeba..0000000000 --- a/test/files/run/t6329_vanilla_bug.check +++ /dev/null @@ -1,2 +0,0 @@ -scala.collection.immutable.List[Any] -scala.collection.immutable.List |