summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-08-06 16:00:39 -0700
committerSeth Tisue <seth@tisue.net>2015-08-06 16:00:39 -0700
commitfd5a8bf1a1ef6e4b31afc9a4f38a597152cfe431 (patch)
tree119773cca5af5456394cf6ff9c74367c6630342a /test/files/jvm
parentc75ee6c8cf76139777a4b8a1644abb1f36364f2a (diff)
parentaa0f345de2955819e7048984a7e5fa0acb7e8bc2 (diff)
downloadscala-fd5a8bf1a1ef6e4b31afc9a4f38a597152cfe431.tar.gz
scala-fd5a8bf1a1ef6e4b31afc9a4f38a597152cfe431.tar.bz2
scala-fd5a8bf1a1ef6e4b31afc9a4f38a597152cfe431.zip
Merge pull request #4554 from som-snytt/issue/1931
SI-1931 Hide Predef.any2stringadd in REPL
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/interpreter.check6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check
index 08372685d6..ce3c8062d7 100644
--- a/test/files/jvm/interpreter.check
+++ b/test/files/jvm/interpreter.check
@@ -30,7 +30,7 @@ scala> val four: anotherint = 4
four: anotherint = 4
scala> val bogus: anotherint = "hello"
-<console>:11: error: type mismatch;
+<console>:12: error: type mismatch;
found : String("hello")
required: anotherint
(which expands to) Int
@@ -353,7 +353,7 @@ defined class Term
scala> def f(e: Exp) = e match { // non-exhaustive warning here
case _:Fact => 3
}
-<console>:21: warning: match may not be exhaustive.
+<console>:22: warning: match may not be exhaustive.
It would fail on the following inputs: Exp(), Term()
def f(e: Exp) = e match { // non-exhaustive warning here
^
@@ -363,6 +363,6 @@ scala> :quit
plusOne: (x: Int)Int
res0: Int = 6
res0: String = after reset
-<console>:11: error: not found: value plusOne
+<console>:12: error: not found: value plusOne
plusOne(5) // should be undefined now
^