summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-07-26 12:13:34 +0000
committermichelou <michelou@epfl.ch>2007-07-26 12:13:34 +0000
commitd73c9b51b84049b6eb4206f882c02495aa9559f0 (patch)
treec66f3c372aa39f135642de46ed60e65cec79990f /src
parentedff72ec735a5dd249d0f752171d5e15419f4fd9 (diff)
downloadscala-d73c9b51b84049b6eb4206f882c02495aa9559f0.tar.gz
scala-d73c9b51b84049b6eb4206f882c02495aa9559f0.tar.bz2
scala-d73c9b51b84049b6eb4206f882c02495aa9559f0.zip
fixed warning messages
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala4
-rw-r--r--src/library/scala/inline.scala4
-rw-r--r--src/library/scala/noinline.scala9
3 files changed, 8 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 805b1e04a6..bad2cff766 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -572,10 +572,10 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable
} else {
//assert(symData.isEmpty || !settings.stop.value.isEmpty || !settings.skip.value.isEmpty, symData)
if (deprecationWarnings) {
- warning("there were deprecation warnings; re-run with -deprecation for details")
+ warning("there were deprecation warnings; re-run with " + settings.deprecation.name + " for details")
}
if (uncheckedWarnings) {
- warning("there were unchecked warnings; re-run with -unchecked for details")
+ warning("there were unchecked warnings; re-run with " + settings.unchecked.name + " for details")
}
}
for ((sym, file) <- symSource.elements) resetPackageClass(sym.owner)
diff --git a/src/library/scala/inline.scala b/src/library/scala/inline.scala
index de3de3b453..9ab4e4ee3f 100644
--- a/src/library/scala/inline.scala
+++ b/src/library/scala/inline.scala
@@ -1,7 +1,7 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | **
+** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
\* */
@@ -18,4 +18,4 @@ package scala
* @author Lex Spoon
* @version 1.0, 2007-5-21
*/
-class inline extends StaticAnnotation {}
+class inline extends StaticAnnotation
diff --git a/src/library/scala/noinline.scala b/src/library/scala/noinline.scala
index 232de52f9d..72d87d9daf 100644
--- a/src/library/scala/noinline.scala
+++ b/src/library/scala/noinline.scala
@@ -1,7 +1,7 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | **
+** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
\* */
@@ -12,11 +12,10 @@
package scala
/**
- * An annotation on methods that forbids the compiler to
- * inline the method, no matter how safe the inlining appears
- * to be.
+ * An annotation on methods that forbids the compiler to inline the
+ * method, no matter how safe the inlining appears to be.
*
* @author Lex Spoon
* @version 1.0, 2007-5-21
*/
-class noinline extends StaticAnnotation {}
+class noinline extends StaticAnnotation