summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-09-21 15:55:32 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-09-21 15:55:32 +0200
commit5e8627088ac572bd910e99b04145dd5d2751551f (patch)
treef81d61a08dd53c54ddafd85a5d35cbfdce1f75d0 /test/files/jvm
parent7eadd684678611dc0f6710f9fdd14ff52bf8fb78 (diff)
parentd8d8ba71236bc18d0b4c74f9ebead2973dc6e435 (diff)
downloadscala-5e8627088ac572bd910e99b04145dd5d2751551f.tar.gz
scala-5e8627088ac572bd910e99b04145dd5d2751551f.tar.bz2
scala-5e8627088ac572bd910e99b04145dd5d2751551f.zip
Merge pull request #4725 from retronym/topic/completely-2.11
Topic/completely 2.11
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/throws-annot-from-java.check8
1 files changed, 3 insertions, 5 deletions
diff --git a/test/files/jvm/throws-annot-from-java.check b/test/files/jvm/throws-annot-from-java.check
index ace264a4f5..bf639260e7 100644
--- a/test/files/jvm/throws-annot-from-java.check
+++ b/test/files/jvm/throws-annot-from-java.check
@@ -1,10 +1,8 @@
scala> :power
-** Power User mode enabled - BEEP WHIR GYVE **
-** :phase has been set to 'typer'. **
-** scala.tools.nsc._ has been imported **
-** global._, definitions._ also imported **
-** Try :help, :vals, power.<tab> **
+Power mode enabled. :phase is at typer.
+import scala.tools.nsc._, intp.global._, definitions._
+Try :help or completions for vals._ and power._
scala> :paste
// Entering paste mode (ctrl-D to finish)