diff options
| author | Miles Sabin <miles@milessabin.com> | 2009-04-13 20:11:37 +0000 |
|---|---|---|
| committer | Miles Sabin <miles@milessabin.com> | 2009-04-13 20:11:37 +0000 |
| commit | ad156169b5771607b84f44aeb02a3a7d556238bf (patch) | |
| tree | 8e084a3a0e08e41f9cc932e9843e023d5368f46b | |
| parent | c30241b92636a11db0f05d94e5afd28f9222898b (diff) | |
| download | scala-ad156169b5771607b84f44aeb02a3a7d556238bf.tar.gz scala-ad156169b5771607b84f44aeb02a3a7d556238bf.tar.bz2 scala-ad156169b5771607b84f44aeb02a3a7d556238bf.zip | |
Updates for 2.7.4: uncheckedStable movedto scal...
Updates for 2.7.4: uncheckedStable movedto scala.annotation.unchecked;
.setting no longer needed for Aspect based Eclipse plugin; bumped
version numbers.
| -rw-r--r-- | .settings/org.eclipse.jdt.core.prefs | 4 | ||||
| -rw-r--r-- | META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | build.number | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Definitions.scala | 2 | ||||
| -rwxr-xr-x | src/library/scala/annotation/unchecked/uncheckedStable.scala (renamed from src/library/scala/uncheckedStable.scala) | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 5d1010535f..0000000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Sat Aug 16 12:16:34 BST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.scala diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 5443691259..af6cb53a21 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Scala Distribution Bundle-SymbolicName: scala.tools.nsc;singleton:=true -Bundle-Version: 2.7.3.final +Bundle-Version: 2.7.4.RC1 Eclipse-LazyStart: true Bundle-ClassPath: ., diff --git a/build.number b/build.number index 736610f18d..e72f8f0bd8 100644 --- a/build.number +++ b/build.number @@ -1,5 +1,5 @@ #Tue Sep 11 19:21:09 CEST 2007 version.minor=7 -version.patch=3 -version.suffix=final +version.patch=4 +version.suffix=RC1 version.major=2 diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index 977808281a..86a89b1456 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -44,7 +44,7 @@ trait Definitions { var NullClass: Symbol = _ var NothingClass: Symbol = _ var SingletonClass: Symbol = _ - lazy val uncheckedStableClass = getClass("scala.uncheckedStable") // todo: move to annotation.unchecked + lazy val uncheckedStableClass = getClass("scala.annotation.unchecked.uncheckedStable") lazy val uncheckedVarianceClass = getClass("scala.annotation.unchecked.uncheckedVariance") lazy val ClassClass: Symbol = getClass(sn.Class) diff --git a/src/library/scala/uncheckedStable.scala b/src/library/scala/annotation/unchecked/uncheckedStable.scala index 68e5f95f73..9fc7be654d 100755 --- a/src/library/scala/uncheckedStable.scala +++ b/src/library/scala/annotation/unchecked/uncheckedStable.scala @@ -5,7 +5,7 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -package scala +package scala.annotation.unchecked /** An annotation for values that are assumed to be stable even though their * types are volatile. |