summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2016-04-20 10:18:24 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2016-04-20 10:18:24 +0200
commit4f2a20e843c0f07352dff87767cad13636942a3e (patch)
tree17722dfe4b669bf8f28ee4d4495ab6e981af3734 /test/files/run
parent804a4cc1ff9fa159c576be7c685dbb81220c11da (diff)
parent468deadf2aad90fbb61036c66cfa298f33ff6009 (diff)
downloadscala-4f2a20e843c0f07352dff87767cad13636942a3e.tar.gz
scala-4f2a20e843c0f07352dff87767cad13636942a3e.tar.bz2
scala-4f2a20e843c0f07352dff87767cad13636942a3e.zip
Merge pull request #5098 from sjrd/simplify-scala-runtime
Simplify scala.runtime
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/hashCodeBoxesRunTime.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/files/run/hashCodeBoxesRunTime.scala b/test/files/run/hashCodeBoxesRunTime.scala
index ba1a30f5fb..8ad94c252a 100644
--- a/test/files/run/hashCodeBoxesRunTime.scala
+++ b/test/files/run/hashCodeBoxesRunTime.scala
@@ -3,7 +3,8 @@
object Test
{
import java.{ lang => jl }
- import scala.runtime.BoxesRunTime.{ hashFromNumber, hashFromObject }
+ import scala.runtime.BoxesRunTime.hashFromNumber
+ import scala.runtime.ScalaRunTime.{ hash => hashFromAny }
def allSame[T](xs: List[T]) = assert(xs.distinct.size == 1, "failed: " + xs)
@@ -17,7 +18,7 @@ object Test
val hashes = mkNumbers(n) map hashFromNumber
allSame(hashes)
if (n >= 0) {
- val charCode = hashFromObject(n.toChar: Character)
+ val charCode = hashFromAny(n.toChar: Character)
assert(charCode == hashes.head)
}
}