diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-09-14 12:59:46 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-09-14 13:29:49 +0200 |
| commit | b2864f8bf3b9dd27c0a2bf6d389faf054471b4b8 (patch) | |
| tree | 81e5c7ea47ec1e283ac9386ebfa9a926a9be1eab | |
| parent | f4a722d20547a5b4ffe47405d122b34b586c17c3 (diff) | |
| download | scala-b2864f8bf3b9dd27c0a2bf6d389faf054471b4b8.tar.gz scala-b2864f8bf3b9dd27c0a2bf6d389faf054471b4b8.tar.bz2 scala-b2864f8bf3b9dd27c0a2bf6d389faf054471b4b8.zip | |
SI-6310 redeploys the starr
Updates the starr with the changes introduced by the previous commit.
Cleans up obsolete symbols required by the previous starr.
| -rw-r--r-- | lib/scala-compiler-src.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library-src.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-reflect-src.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-reflect.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | src/library/scala/reflect/base/TypeTags.scala | 5 | ||||
| -rw-r--r-- | src/library/scala/reflect/macros/internal/package.scala | 4 |
8 files changed, 6 insertions, 15 deletions
diff --git a/lib/scala-compiler-src.jar.desired.sha1 b/lib/scala-compiler-src.jar.desired.sha1 index bfbcc5a7a3..057d6b26e6 100644 --- a/lib/scala-compiler-src.jar.desired.sha1 +++ b/lib/scala-compiler-src.jar.desired.sha1 @@ -1 +1 @@ -7bad3afb569e2c57d1b299b61e0d3c0fa1b1d8d9 ?scala-compiler-src.jar +acfbbb4117b222b488226b4a89d5e732eb59f19c ?scala-compiler-src.jar diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index ef2063bc3d..d4cad8f868 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -5f73d19a6ec70f67e6d8a2f08cde3551e51b2b79 ?scala-compiler.jar +e0c0f2326622f535aa86978dee74dc7ac86e401b ?scala-compiler.jar diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1 index 0709415f43..c8515e61de 100644 --- a/lib/scala-library-src.jar.desired.sha1 +++ b/lib/scala-library-src.jar.desired.sha1 @@ -1 +1 @@ -26c6c1cf7be57afa519ec641fb78e16a771a534a ?scala-library-src.jar +52b0ea12b0fe6c2150434fdda3909c2aa927a325 ?scala-library-src.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index edc3614c6d..323d3441f8 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -4f14def979133788dd91117a203a40e35cd24528 ?scala-library.jar +7a35fcd17b39ea1e13cc8c919e1e556eed81e799 ?scala-library.jar diff --git a/lib/scala-reflect-src.jar.desired.sha1 b/lib/scala-reflect-src.jar.desired.sha1 index a7a9eddd93..839d77da3a 100644 --- a/lib/scala-reflect-src.jar.desired.sha1 +++ b/lib/scala-reflect-src.jar.desired.sha1 @@ -1 +1 @@ -60c61467bc992752bf81bc0ca783a9d6a72db588 ?scala-reflect-src.jar +fc25fdfd30959e77b85c0c7917005a83890f94a2 ?scala-reflect-src.jar diff --git a/lib/scala-reflect.jar.desired.sha1 b/lib/scala-reflect.jar.desired.sha1 index a1732595b8..88ea78c303 100644 --- a/lib/scala-reflect.jar.desired.sha1 +++ b/lib/scala-reflect.jar.desired.sha1 @@ -1 +1 @@ -b3764f8b2f7719d1fbfaf9767a3a68f6ef7ad876 ?scala-reflect.jar +5aca838ee9d82be45fb476c1722f71842d5d528e ?scala-reflect.jar diff --git a/src/library/scala/reflect/base/TypeTags.scala b/src/library/scala/reflect/base/TypeTags.scala index fd7a204ff4..37e0c4f02f 100644 --- a/src/library/scala/reflect/base/TypeTags.scala +++ b/src/library/scala/reflect/base/TypeTags.scala @@ -103,11 +103,6 @@ trait TypeTags { self: Universe => import definitions._ - // should be removed in the subsequent commit - // after the starr is redeployed - trait AbsTypeTag[T] - object AbsTypeTag - /** * If an implicit value of type u.WeakTypeTag[T] is required, the compiler will make one up on demand. * The implicitly created value contains in its tpe field a value of type u.Type that is a reflective representation of T. diff --git a/src/library/scala/reflect/macros/internal/package.scala b/src/library/scala/reflect/macros/internal/package.scala index bbb57667ea..aca2b765f1 100644 --- a/src/library/scala/reflect/macros/internal/package.scala +++ b/src/library/scala/reflect/macros/internal/package.scala @@ -7,10 +7,6 @@ import scala.reflect.ClassTag // implementation is magically hardwired into `scala.reflect.reify.Taggers` // todo. once we have implicit macros for tag generation, we can remove these anchors package object internal { - // should be removed in the subsequent commit - // after the starr is redeployed - private[scala] def materializeAbsTypeTag[T](u: BaseUniverse): u.WeakTypeTag[T] = ??? // macro - private[scala] def materializeClassTag[T](u: BaseUniverse): ClassTag[T] = ??? // macro private[scala] def materializeWeakTypeTag[T](u: BaseUniverse): u.WeakTypeTag[T] = ??? // macro private[scala] def materializeTypeTag[T](u: BaseUniverse): u.TypeTag[T] = ??? // macro |