summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2011-09-29 13:23:15 +0000
committermichelou <michelou@epfl.ch>2011-09-29 13:23:15 +0000
commitf9aa83a6e5086774e904638d183726edfe324a00 (patch)
tree2e4f6f889a49973b97baa5c5f8879c1807dc9e20 /src/library
parent4529141cc154a9d7359e16344d7a318ca529f89f (diff)
downloadscala-f9aa83a6e5086774e904638d183726edfe324a00.tar.gz
scala-f9aa83a6e5086774e904638d183726edfe324a00.tar.bz2
scala-f9aa83a6e5086774e904638d183726edfe324a00.zip
Removed special comments on Martin's request
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/Predef.scala2
-rw-r--r--src/library/scala/package.scala2
-rw-r--r--src/library/scala/runtime/ScalaRunTime.scala4
-rw-r--r--src/library/scala/sys/process/Process.scala4
4 files changed, 0 insertions, 12 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 8a2729a3f9..54111dceba 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -114,10 +114,8 @@ object Predef extends LowPriorityImplicits {
def implicitly[T](implicit e: T) = e // for summoning implicit values from the nether world
@inline def locally[T](x: T): T = x // to communicate intent and avoid unmoored statements
- /*@XML*/
// Apparently needed for the xml library
val $scope = scala.xml.TopScope
- /*XML@*/
// Deprecated
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala
index 1267e90c6d..0c5d10b15e 100644
--- a/src/library/scala/package.scala
+++ b/src/library/scala/package.scala
@@ -75,12 +75,10 @@ package object scala {
@deprecated("Use Thread.currentThread instead", "2.9.0")
def currentThread = java.lang.Thread.currentThread()
- /*@XML*/
// Moved back into Predef to avoid unnecessary indirection by
// way of the scala package object within the standard library,
// but bridged for compatibility.
@bridge def $scope = scala.xml.TopScope
- /*XML@*/
// Numeric types which were moved into scala.math.*
diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index a56055e210..33f93e610d 100644
--- a/src/library/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -13,9 +13,7 @@ import scala.collection.mutable.WrappedArray
import scala.collection.immutable.{ StringLike, NumericRange, List, Stream, Nil, :: }
import scala.collection.generic.{ Sorted }
import scala.util.control.ControlThrowable
-/*@XML*/
import scala.xml.{ Node, MetaData }
-/*XML@*/
import java.lang.Double.doubleToLongBits
import java.lang.reflect.{ Modifier, Method => JMethod }
@@ -280,10 +278,8 @@ object ScalaRunTime {
// When doing our own iteration is dangerous
def useOwnToString(x: Any) = x match {
- /*@XML*/
// Node extends NodeSeq extends Seq[Node] and MetaData extends Iterable[MetaData]
case _: Node | _: MetaData => true
- /*XML@*/
// Range/NumericRange have a custom toString to avoid walking a gazillion elements
case _: Range | _: NumericRange[_] => true
// Sorted collections to the wrong thing (for us) on iteration - ticket #3493
diff --git a/src/library/scala/sys/process/Process.scala b/src/library/scala/sys/process/Process.scala
index ff02b38fd3..db10ff9c1d 100644
--- a/src/library/scala/sys/process/Process.scala
+++ b/src/library/scala/sys/process/Process.scala
@@ -132,9 +132,7 @@ trait ProcessCreation {
* apply(<x> {dxPath.absolutePath} --dex --output={classesDexPath.absolutePath} {classesMinJarPath.absolutePath}</x>)
* }}}
*/
- /*@XML*/
def apply(command: scala.xml.Elem): ProcessBuilder = apply(command.text.trim)
- /*XML@*/
/** Create a [[scala.sys.process.ProcessBuilder]] from a `Boolean`. This can be
* to force an exit value.
@@ -207,9 +205,7 @@ trait ProcessImplicits {
implicit def urlToProcess(url: URL): URLBuilder = apply(url)
/** Implicitly convert a [[scala.xml.Elem]] into a [[scala.sys.process.ProcessBuilder]] */
- /*@XML*/
implicit def xmlToProcess(command: scala.xml.Elem): ProcessBuilder = apply(command)
- /*XML@*/
/** Implicitly convert a `String` into a [[scala.sys.process.ProcessBuilder]] */
implicit def stringToProcess(command: String): ProcessBuilder = apply(command)