summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2011-10-20 22:29:04 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2011-10-20 22:29:04 +0000
commitd5b81b6cb1f3880a791118609c2d308c34c075f2 (patch)
treee67554e7045d8edf600b9da76bca743e6b296ee4 /src/library
parent8704ed2fc92e3d82287317fe34126c5d4d84e10c (diff)
downloadscala-d5b81b6cb1f3880a791118609c2d308c34c075f2.tar.gz
scala-d5b81b6cb1f3880a791118609c2d308c34c075f2.tar.bz2
scala-d5b81b6cb1f3880a791118609c2d308c34c075f2.zip
misc fixes while working on virtualizing patter...
misc fixes while working on virtualizing pattern matching not directly related to pattern matching, though review by extempore
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/Predef.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 1d3239a176..018cbdefd7 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -111,7 +111,7 @@ object Predef extends LowPriorityImplicits {
// Minor variations on identity functions
def identity[A](x: A): A = x // @see `conforms` for the implicit version
- def implicitly[T](implicit e: T) = e // for summoning implicit values from the nether world
+ @inline def implicitly[T](implicit e: T) = e // for summoning implicit values from the nether world -- TODO: when dependent method types are on by default, give this result type `e.type`, so that inliner has better chance of knowing which method to inline in calls like `implicitly[MatchingStrategy[Option]].zero`
@inline def locally[T](x: T): T = x // to communicate intent and avoid unmoored statements
// Apparently needed for the xml library