summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/ctor-order.scala6
-rw-r--r--test/files/run/docgenerator.scala2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/ctor-order.scala b/test/files/run/ctor-order.scala
index 6201a4b70f..44e981e413 100644
--- a/test/files/run/ctor-order.scala
+++ b/test/files/run/ctor-order.scala
@@ -6,13 +6,13 @@ class Outer {
val x = 10;
}
- class X extends AnyRef with M1 {
+ class X extends {
/* The constructor of X should set this.$outer to the outer instance
* *before* calling the super constructors. This is tested by
* mixin M1, which tries to access global from the enclosing class.
*/
- val outer = Outer.this;
- }
+ val outer = Outer.this
+ } with AnyRef with M1
trait M1 { self: X =>
Console.println(global.x);
diff --git a/test/files/run/docgenerator.scala b/test/files/run/docgenerator.scala
index 4792106456..b738231617 100644
--- a/test/files/run/docgenerator.scala
+++ b/test/files/run/docgenerator.scala
@@ -117,7 +117,7 @@ object Foo2 {
val command = new CompilerCommand(List.fromArray(args), docSettings, error, false)
try {
object compiler extends Global(command.settings, reporter) {
- override val onlyPresentation = true
+ override def onlyPresentation = true
}
if (reporter.hasErrors) {
reporter.flush()