diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-05-17 15:47:12 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-05-17 15:47:12 +1000 |
| commit | cf38f078ad3bda0127e741a18f66d2c02d77b05a (patch) | |
| tree | 6ace20ed861a155ac66f8ca96bad9107ce1be097 /test/files/jvm | |
| parent | eac1af364e99a6712c5e54e257216027b2ab127e (diff) | |
| parent | 512bf7a841a2c11723c6f4537a1d9ef401b88b9b (diff) | |
| download | scala-cf38f078ad3bda0127e741a18f66d2c02d77b05a.tar.gz scala-cf38f078ad3bda0127e741a18f66d2c02d77b05a.tar.bz2 scala-cf38f078ad3bda0127e741a18f66d2c02d77b05a.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20160517
Conflicts:
build.sbt
test/files/run/repl-javap-app.check
test/files/run/repl-javap-app.scala
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/interpreter.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check index ce3c8062d7..9a2162a906 100644 --- a/test/files/jvm/interpreter.check +++ b/test/files/jvm/interpreter.check @@ -353,7 +353,7 @@ defined class Term scala> def f(e: Exp) = e match { // non-exhaustive warning here case _:Fact => 3 } -<console>:22: warning: match may not be exhaustive. +<console>:18: 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 ^ |