From 447256c89148e07dfddcfc065bd5f0946b0ae9aa Mon Sep 17 00:00:00 2001
From: VladimirNik <vladimir.nikolaev9@gmail.com>
Date: Mon, 22 Feb 2016 14:50:35 +0100
Subject: Neg tests: remove xerror parameter from tests (compute based on //
 error)

---
 tests/neg/i827.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/neg/i827.scala')

diff --git a/tests/neg/i827.scala b/tests/neg/i827.scala
index cc795b590..182ffe0b1 100644
--- a/tests/neg/i827.scala
+++ b/tests/neg/i827.scala
@@ -1,7 +1,7 @@
 trait A { trait Inner }
 trait B { self: A =>
-  trait Inner extends self.Inner
+  trait Inner extends self.Inner // error: cannot merge trait Inner in trait A with trait Inner in trait B as members of type (A & B)(B.this)
 }
 
 
-class C extends C
+class C extends C // error: cyclic inheritance: class C extends itself
-- 
cgit v1.2.3