summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-04 11:56:16 -0800
committerPaul Phillips <paulp@improving.org>2012-02-04 12:59:08 -0800
commit3a6b1124f18acf95923e228f6f41bdf3c23e0173 (patch)
tree4f934f594942d6366e3ca75663721e15ccb53c1a /lib
parent6b8aed72e4f7a7135a434533399a772bf7078101 (diff)
downloadscala-3a6b1124f18acf95923e228f6f41bdf3c23e0173.tar.gz
scala-3a6b1124f18acf95923e228f6f41bdf3c23e0173.tar.bz2
scala-3a6b1124f18acf95923e228f6f41bdf3c23e0173.zip
Guard List_apply from premature forcitude.
Solved the annotation cycle puzzle. Was being burned again by the hack which preferentially treats List() as Nil to avoid List's extractor. This commit includes a new starr which fully bootstraps. Also at this point traits can extend Any and will not be given an AnyRef parent (until erasure.) This is the case for AnyVal and NotNull.
Diffstat (limited to 'lib')
-rw-r--r--lib/scala-compiler.jar.desired.sha12
-rw-r--r--lib/scala-library-src.jar.desired.sha12
-rw-r--r--lib/scala-library.jar.desired.sha12
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index cc8631c6d4..22e714ad41 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-65ea33d0d4cc4aab5472f123524640fd1fab0a85 ?scala-compiler.jar
+83df84e719c0f966c67855a1b453aaff2c01e4f7 ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index 81d1f677a5..cb39ee8604 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-d92a0fd350a661b4ba55f1aeea43a2ba5dec4629 ?scala-library-src.jar
+04d9d47973b10ec7353e2a8199b1bd5c62fb540a ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 975649f4b4..009d5f82ea 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-ff3132990962fd0b779a5e8ceef163acdf0c3e29 ?scala-library.jar
+c8e01ec6416bd883e996cf8c6916bf0173c31486 ?scala-library.jar