reverted 'doArg' change made in r18738, removed...

reverted 'doArg' change made in r18738, removed a few warnings

2 files changed, 5 insertions, 3 deletions

diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala
index 8de201ec9a..f319afdf2e 100644
--- a/src/library/scala/Enumeration.scala
+++ b/src/library/scala/Enumeration.scala
@@ -169,14 +169,16 @@ abstract class Enumeration(initial: Int, names: String*) {
     /** this enumeration value as an <code>Int</code> bit mask.
      *  @throws IllegalArgumentException if <code>id</code> is greater than 31
      */
-    @deprecated def mask32: Int = {
+    @deprecated("mask32 will be removed")
+    def mask32: Int = {
       if (id >= 32) throw new IllegalArgumentException
       1  << id
     }
     /** this enumeration value as an <code>Long</code> bit mask.
      *  @throws IllegalArgumentException if <code>id</code> is greater than 63
      */
-    @deprecated def mask64: Long = {
+    @deprecated("mask64 will be removed")
+    def mask64: Long = {
       if (id >= 64) throw new IllegalArgumentException
       1L << id
     }
diff --git a/src/library/scala/collection/immutable/StringLike.scala b/src/library/scala/collection/immutable/StringLike.scala
index f45acc1506..5d1b581594 100644
--- a/src/library/scala/collection/immutable/StringLike.scala
+++ b/src/library/scala/collection/immutable/StringLike.scala
@@ -127,7 +127,7 @@ self =>
     else if (toString.length == 0) ""
     else {
       val chars = toString.toCharArray
-      chars(0) = chars(0).toUpperCase
+      chars(0) = chars(0).toUpper
       new String(chars)
     }