From 33b0e7b1ab0e71f525c75705dcd91b4b7d9d0994 Mon Sep 17 00:00:00 2001
From: Samuel Gruetter <samuel.gruetter@epfl.ch>
Date: Wed, 19 Mar 2014 17:07:46 +0100
Subject: [PATCH 1/3] apply srewrite (explicit types for implicits + no
 procedure syntax

for constructors) to tests/untried/pos
---
 tests/untried/pos/SI-7638.scala                          | 2 +-
 tests/untried/pos/depmet_implicit_chaining_zw.scala      | 4 ++--
 tests/untried/pos/depmet_implicit_norm_ret.scala         | 4 ++--
 tests/untried/pos/depmet_implicit_oopsla_session.scala   | 4 ++--
 tests/untried/pos/depmet_implicit_oopsla_session_2.scala | 4 ++--
 tests/untried/pos/depmet_implicit_oopsla_zipwith.scala   | 4 ++--
 tests/untried/pos/implicits-new.scala                    | 8 ++++----
 tests/untried/pos/implicits-old.scala                    | 8 ++++----
 tests/untried/pos/presuperContext.scala                  | 2 +-
 tests/untried/pos/t0438.scala                            | 2 +-
 tests/untried/pos/t0591.scala                            | 2 +-
 tests/untried/pos/t0786.scala                            | 4 ++--
 tests/untried/pos/t0851.scala                            | 2 +-
 tests/untried/pos/t0872.scala                            | 2 +-
 tests/untried/pos/t1147.scala                            | 2 +-
 tests/untried/pos/t1832.scala                            | 2 +-
 tests/untried/pos/t2060.scala                            | 2 +-
 tests/untried/pos/t2421_delitedsl.scala                  | 2 +-
 tests/untried/pos/t2421b_pos.scala                       | 2 +-
 tests/untried/pos/t2421c.scala                           | 4 ++--
 tests/untried/pos/t2782.scala                            | 4 ++--
 tests/untried/pos/t2913.scala                            | 6 +++---
 tests/untried/pos/t3177.scala                            | 2 +-
 tests/untried/pos/t3373.scala                            | 2 +-
 tests/untried/pos/t3808.scala                            | 2 +-
 tests/untried/pos/t3999/a_1.scala                        | 4 ++--
 tests/untried/pos/t4273.scala                            | 4 ++--
 tests/untried/pos/t4457_1.scala                          | 8 ++++----
 tests/untried/pos/t4975.scala                            | 2 +-
 tests/untried/pos/t5156.scala                            | 6 +++---
 tests/untried/pos/t5892.scala                            | 2 +-
 tests/untried/pos/t6201.scala                            | 4 ++--
 tests/untried/pos/t628.scala                             | 2 +-
 tests/untried/pos/t6556.scala                            | 2 +-
 tests/untried/pos/t7180.scala                            | 2 +-
 tests/untried/pos/t7486-named.scala                      | 2 +-
 tests/untried/pos/t7486.scala                            | 2 +-
 tests/untried/pos/t8219b.scala                           | 4 ++--
 tests/untried/pos/tcpoly_infer_ticket1864.scala          | 2 +-
 tests/untried/pos/ticket2201.scala                       | 2 +-
 40 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/tests/untried/pos/SI-7638.scala b/tests/untried/pos/SI-7638.scala
index 831475d00506..ed581efe98dc 100644
--- a/tests/untried/pos/SI-7638.scala
+++ b/tests/untried/pos/SI-7638.scala
@@ -9,7 +9,7 @@ trait ArrayVectorOrder[@specialized(Int) A] extends Ordering[A] {
 }
 
 object vectorOrder {
-  implicit def arrayOrder[@specialized(Int) A]() =
+  implicit def arrayOrder[@specialized(Int) A](): miniboxing.tests.compile.ArrayVectorOrder[A] =
   /*
    * Before applying patch:
    *
diff --git a/tests/untried/pos/depmet_implicit_chaining_zw.scala b/tests/untried/pos/depmet_implicit_chaining_zw.scala
index ce5ea476d8c4..a9da1e9764bd 100644
--- a/tests/untried/pos/depmet_implicit_chaining_zw.scala
+++ b/tests/untried/pos/depmet_implicit_chaining_zw.scala
@@ -7,11 +7,11 @@ trait ZipWith[N, S] {
 }
 
 object ZipWith {
-  implicit def ZeroZipWith[S] = new ZipWith[Zero, S] {
+  implicit def ZeroZipWith[S]: ZipWith[Zero,S]{type T = Stream[S]} = new ZipWith[Zero, S] {
     type T = Stream[S]
   }
 
-  implicit def SuccZipWith[N, S, R](implicit zWith : ZipWith[N, R]) = new ZipWith[Succ[N], S => R] {
+  implicit def SuccZipWith[N, S, R](implicit zWith : ZipWith[N, R]): ZipWith[Succ[N],S => R]{type T = Stream[S] => zWith.T} = new ZipWith[Succ[N], S => R] {
     type T = Stream[S] => zWith.T // dependent types replace the associated types functionality
   }
 
diff --git a/tests/untried/pos/depmet_implicit_norm_ret.scala b/tests/untried/pos/depmet_implicit_norm_ret.scala
index 0c587cf16429..85be750b4296 100644
--- a/tests/untried/pos/depmet_implicit_norm_ret.scala
+++ b/tests/untried/pos/depmet_implicit_norm_ret.scala
@@ -3,7 +3,7 @@ object Test{
 
   // fallback, lower priority (overloading rules apply: pick alternative in subclass lowest in subtyping lattice)
   class ZipWithDefault {
-    implicit def ZeroZipWith[S] = new ZipWith[S] {
+    implicit def ZeroZipWith[S]: Test.ZipWith[S]{type T = Stream[S]} = new ZipWith[S] {
       type T = Stream[S]
     }
   }
@@ -12,7 +12,7 @@ object Test{
     // def apply[S: ZipWith](s : S) = ?[ZipWith[S]].zipWith(s) // TODO: bug return type should be inferred
     def apply[S](s : S)(implicit zw: ZipWith[S]): zw.T = zw.zipWith(s)
 
-    implicit def SuccZipWith[S,R](implicit zWith : ZipWith[R]) = new ZipWith[S => R] {
+    implicit def SuccZipWith[S,R](implicit zWith : ZipWith[R]): Test.ZipWith[S => R]{type T = Stream[S] => zWith.T} = new ZipWith[S => R] {
       type T = Stream[S] => zWith.T // dependent types replace the associated types functionality
     }
   }
diff --git a/tests/untried/pos/depmet_implicit_oopsla_session.scala b/tests/untried/pos/depmet_implicit_oopsla_session.scala
index 7e51861d60d4..aa847805613a 100644
--- a/tests/untried/pos/depmet_implicit_oopsla_session.scala
+++ b/tests/untried/pos/depmet_implicit_oopsla_session.scala
@@ -11,7 +11,7 @@ object Sessions {
     def run(p: Stop, dp: Stop): Unit = {}
   }
 
-  implicit def InDual[A, B](implicit sessionDIn: Session[B]) =
+  implicit def InDual[A, B](implicit sessionDIn: Session[B]): Sessions.Session[Sessions.In[A,B]]{type Dual = Sessions.Out[A,sessionDIn.Dual]} =
     new Session[In[A, B]] {
       type Dual = Out[A, sessionDIn.Dual]
 
@@ -19,7 +19,7 @@ object Sessions {
         sessionDIn.run(p.func(dp.x), dp.y)
   }
 
-  implicit def OutDual[A, B](implicit sessionDOut: Session[B]) =
+  implicit def OutDual[A, B](implicit sessionDOut: Session[B]): Sessions.Session[Sessions.Out[A,B]]{type Dual = Sessions.In[A,sessionDOut.Dual]} =
     new Session[Out[A, B]] {
      type Dual = In[A, sessionDOut.Dual]
 
diff --git a/tests/untried/pos/depmet_implicit_oopsla_session_2.scala b/tests/untried/pos/depmet_implicit_oopsla_session_2.scala
index 598d3454c179..4951c10a1408 100644
--- a/tests/untried/pos/depmet_implicit_oopsla_session_2.scala
+++ b/tests/untried/pos/depmet_implicit_oopsla_session_2.scala
@@ -33,7 +33,7 @@ object Sessions {
   //            CD is the dual of Cont
   // -------------------------------------------[InDual]
   // Out[Data, CD] is the dual of In[Data, Cont]
-  implicit def InDual[Data, Cont](implicit cont: Session[Cont]) = new Session[In[Data, Cont]] {
+  implicit def InDual[Data, Cont](implicit cont: Session[Cont]): Sessions.Session[Sessions.In[Data,Cont]]{type Dual = Sessions.Out[Data,cont.Dual]} = new Session[In[Data, Cont]] {
     type Dual = Out[Data, cont.Dual]
 
     def run(self: Self, dual: Dual): Unit =
@@ -43,7 +43,7 @@ object Sessions {
   //            CD is the dual of Cont
   // -------------------------------------------[OutDual]
   // In[Data, CD] is the dual of Out[Data, Cont]
-  implicit def OutDual[Data, Cont](implicit cont: Session[Cont]) = new Session[Out[Data, Cont]] {
+  implicit def OutDual[Data, Cont](implicit cont: Session[Cont]): Sessions.Session[Sessions.Out[Data,Cont]]{type Dual = Sessions.In[Data,cont.Dual]} = new Session[Out[Data, Cont]] {
     type Dual = In[Data, cont.Dual]
 
     def run(self: Self, dual: Dual): Unit =
diff --git a/tests/untried/pos/depmet_implicit_oopsla_zipwith.scala b/tests/untried/pos/depmet_implicit_oopsla_zipwith.scala
index c034e3ef5b7b..83171f8655d7 100644
--- a/tests/untried/pos/depmet_implicit_oopsla_zipwith.scala
+++ b/tests/untried/pos/depmet_implicit_oopsla_zipwith.scala
@@ -9,13 +9,13 @@ trait ZipWith[N, S] {
   def zipWith: N => S => T = n => f => manyApp(n)(continually(f))
 }
 object ZipWith {
-  implicit def ZeroZipWith[S] = new ZipWith[Zero, S] {
+  implicit def ZeroZipWith[S]: ZipWith[Zero,S]{type T = Stream[S]} = new ZipWith[Zero, S] {
     type T = Stream[S]
 
     def manyApp = n => xs => xs
   }
 
-  implicit def SuccZipWith[N, S, R](implicit zw: ZipWith[N, R]) =
+  implicit def SuccZipWith[N, S, R](implicit zw: ZipWith[N, R]): ZipWith[Succ[N],S => R]{type T = Stream[S] => zw.T; def zapp[A, B](xs: Stream[A => B],ys: Stream[A]): Stream[B]} =
     new ZipWith[Succ[N],S => R] {
       type T = Stream[S] => zw.T
 
diff --git a/tests/untried/pos/implicits-new.scala b/tests/untried/pos/implicits-new.scala
index d5bf0ecfd6b2..f6b69c7077d2 100644
--- a/tests/untried/pos/implicits-new.scala
+++ b/tests/untried/pos/implicits-new.scala
@@ -32,8 +32,8 @@ object Test1579 {
   class Query[E](val value: E)
   class Invoker(q: Any) { val foo = null }
 
-  implicit def unwrap[C](q: Query[C]) = q.value
-  implicit def invoker(q: Query[Column]) = new Invoker(q)
+  implicit def unwrap[C](q: Query[C]): C = q.value
+  implicit def invoker(q: Query[Column]): Test1579.Invoker = new Invoker(q)
 
   val q = new Query(new Column)
   q.foo
@@ -45,9 +45,9 @@ object Test1625 {
     def unwrap() = x
   }
 
-  implicit def byName[A](x: =>A) = new Wrapped(x)
+  implicit def byName[A](x: =>A): Test1625.Wrapped = new Wrapped(x)
 
-  implicit def byVal[A](x: A) = x
+  implicit def byVal[A](x: A): A = x
 
   def main(args: Array[String]) = {
 
diff --git a/tests/untried/pos/implicits-old.scala b/tests/untried/pos/implicits-old.scala
index b0e775086dfc..96edd01f3029 100644
--- a/tests/untried/pos/implicits-old.scala
+++ b/tests/untried/pos/implicits-old.scala
@@ -29,8 +29,8 @@ object Test1579 {
   class Query[E](val value: E)
   class Invoker(q: Any) { val foo = null }
 
-  implicit def unwrap[C](q: Query[C]) = q.value
-  implicit def invoker(q: Query[Column]) = new Invoker(q)
+  implicit def unwrap[C](q: Query[C]): C = q.value
+  implicit def invoker(q: Query[Column]): Test1579.Invoker = new Invoker(q)
 
   val q = new Query(new Column)
   q.foo
@@ -42,9 +42,9 @@ object Test1625 {
     def unwrap() = x
   }
 
-  implicit def byName[A](x: =>A) = new Wrapped(x)
+  implicit def byName[A](x: =>A): Test1625.Wrapped = new Wrapped(x)
 
-  implicit def byVal[A](x: A) = x
+  implicit def byVal[A](x: A): A = x
 
   def main(args: Array[String]) = {
 
diff --git a/tests/untried/pos/presuperContext.scala b/tests/untried/pos/presuperContext.scala
index cc34263073ec..437765598d30 100644
--- a/tests/untried/pos/presuperContext.scala
+++ b/tests/untried/pos/presuperContext.scala
@@ -6,7 +6,7 @@ class B(x: Int)
 
 class D {
   class C(x: Int) extends B({val test: D = this; x}) {
-    def this() {
+    def this() = {
       this({val test: D = this; 1})
     }
   }
diff --git a/tests/untried/pos/t0438.scala b/tests/untried/pos/t0438.scala
index fa5b7711ffe1..dd1e7f9a9f9b 100644
--- a/tests/untried/pos/t0438.scala
+++ b/tests/untried/pos/t0438.scala
@@ -1,5 +1,5 @@
 class Foo {
-  implicit def pair2fun2[A, B, C](f: (A, B) => C) =
+  implicit def pair2fun2[A, B, C](f: (A, B) => C): ((A, B)) => C =
      {p: (A, B) => f(p._1, p._2) }
 
   def foo(f: ((Int, Int)) => Int) = f
diff --git a/tests/untried/pos/t0591.scala b/tests/untried/pos/t0591.scala
index 15f2dba08e21..6cb5e29b48dc 100644
--- a/tests/untried/pos/t0591.scala
+++ b/tests/untried/pos/t0591.scala
@@ -1,7 +1,7 @@
 object Test {
   def implicitly[T](implicit t : T) = t
   implicit def perhaps[T](implicit t : T) : Option[T] = Some(t)
-  implicit val hello = "Hello"
+  implicit val hello: String = "Hello"
   implicitly[String]
   implicitly[Option[String]]
 }
diff --git a/tests/untried/pos/t0786.scala b/tests/untried/pos/t0786.scala
index 4cd09f4a16a6..b347b0bc5403 100644
--- a/tests/untried/pos/t0786.scala
+++ b/tests/untried/pos/t0786.scala
@@ -7,11 +7,11 @@ object ImplicitProblem {
     def eval: Int
   }
 
-  implicit def toRep0(n: Int) = new Rep[Int] {
+  implicit def toRep0(n: Int): ImplicitProblem.Rep[Int] = new Rep[Int] {
     def eval = 0
   }
 
-  implicit def toRepN[T](n: M[T])(implicit f: T => Rep[T]) = new Rep[M[T]] {
+  implicit def toRepN[T](n: M[T])(implicit f: T => Rep[T]): ImplicitProblem.Rep[ImplicitProblem.M[T]] = new Rep[M[T]] {
     def eval = f(nullval[T]).eval + 1
   }
 
diff --git a/tests/untried/pos/t0851.scala b/tests/untried/pos/t0851.scala
index fc7109dcd457..fcfdba51eba5 100644
--- a/tests/untried/pos/t0851.scala
+++ b/tests/untried/pos/t0851.scala
@@ -5,7 +5,7 @@ object test1 {
     def apply(t : T) = (s:T2) => f(t,s)
     def apply(p : (T,T2)) = f(p._1,p._2)
   }
-  implicit def g[T](f : (T,String) => String) = Foo(f)
+  implicit def g[T](f : (T,String) => String): test.test1.Foo[T,String] = Foo(f)
   def main(args : Array[String]) : Unit = {
     val f = (x:Int,s:String) => s + x
     println(f(1))
diff --git a/tests/untried/pos/t0872.scala b/tests/untried/pos/t0872.scala
index 79df8e804229..ccaee80521c2 100644
--- a/tests/untried/pos/t0872.scala
+++ b/tests/untried/pos/t0872.scala
@@ -1,7 +1,7 @@
 object Main {
   def main(args : Array[String]): Unit = {
     val fn = (a : Int, str : String) => "a: " + a + ", str: " + str
-    implicit def fx[T](f : (T,String) => String) = (x:T) => f(x,null)
+    implicit def fx[T](f : (T,String) => String): T => String = (x:T) => f(x,null)
     println(fn(1))
     ()
   }
diff --git a/tests/untried/pos/t1147.scala b/tests/untried/pos/t1147.scala
index d4b3967ddd51..ff2e8bc5276d 100644
--- a/tests/untried/pos/t1147.scala
+++ b/tests/untried/pos/t1147.scala
@@ -1,5 +1,5 @@
 class App(arg: String) {
-  @deprecated("..") def this() {
+  @deprecated("..") def this() = {
     this("foo")
   }
 }
diff --git a/tests/untried/pos/t1832.scala b/tests/untried/pos/t1832.scala
index 7e435d70b583..3a5280640cf3 100644
--- a/tests/untried/pos/t1832.scala
+++ b/tests/untried/pos/t1832.scala
@@ -2,7 +2,7 @@ trait Cloning {
   trait Foo
   def fn(g: Any => Unit): Foo
 
-  implicit def mkStar(i: Int) = new { def *(a: Foo): Foo = null }
+  implicit def mkStar(i: Int): AnyRef{def *(a: Cloning.this.Foo): Cloning.this.Foo} = new { def *(a: Foo): Foo = null }
 
   val pool = 4 * fn { case ghostSYMBOL: Int => ghostSYMBOL * 2 }
 }
diff --git a/tests/untried/pos/t2060.scala b/tests/untried/pos/t2060.scala
index 2c701150e4bd..0b907906286e 100755
--- a/tests/untried/pos/t2060.scala
+++ b/tests/untried/pos/t2060.scala
@@ -24,7 +24,7 @@ object Test {
     def plus [I](op : Op[I]): Op[I] = op;
   }
 
-  implicit def iToRich(x : Double) =
+  implicit def iToRich(x : Double): Test.Rich =
     new Rich(x);
 
   // fails to compile
diff --git a/tests/untried/pos/t2421_delitedsl.scala b/tests/untried/pos/t2421_delitedsl.scala
index da60c1ef3a0a..2580592d96da 100644
--- a/tests/untried/pos/t2421_delitedsl.scala
+++ b/tests/untried/pos/t2421_delitedsl.scala
@@ -8,7 +8,7 @@ trait DeliteDSL {
   }
 
   case class DeliteInt(x: Int) extends Forcible[Int]
-  implicit val forcibleInt = Forcible.factory(DeliteInt(_: Int))
+  implicit val forcibleInt: DeliteDSL.this.<~<[Int,DeliteDSL.this.Forcible[Int]] = Forcible.factory(DeliteInt(_: Int))
 
   import scala.collection.Traversable
   class DeliteCollection[T](val xs: Traversable[T]) {
diff --git a/tests/untried/pos/t2421b_pos.scala b/tests/untried/pos/t2421b_pos.scala
index 0df346166213..679b8a8d6ea5 100644
--- a/tests/untried/pos/t2421b_pos.scala
+++ b/tests/untried/pos/t2421b_pos.scala
@@ -7,7 +7,7 @@ object Test {
   def f(implicit aa: F[A]) = println(aa)
 
   implicit def a : F[A] = new F[A]()
-  implicit def b[X <: B] = new F[X]()
+  implicit def b[X <: B]: Test.F[X] = new F[X]()
 
   f
 }
diff --git a/tests/untried/pos/t2421c.scala b/tests/untried/pos/t2421c.scala
index d212fb9036f9..bd24cacd729e 100644
--- a/tests/untried/pos/t2421c.scala
+++ b/tests/untried/pos/t2421c.scala
@@ -10,8 +10,8 @@ object Test {
 
   // generalised from t2421b to verify we check enough
   class G[X]
-  implicit def g[X] = new G[X]()
-  implicit def b[X <: B](implicit mx: G[X]) = new F[X]()
+  implicit def g[X]: Test.G[X] = new G[X]()
+  implicit def b[X <: B](implicit mx: G[X]): Test.F[X] = new F[X]()
 
   f
 }
diff --git a/tests/untried/pos/t2782.scala b/tests/untried/pos/t2782.scala
index ab12aaf1fe4d..3b387af8030e 100644
--- a/tests/untried/pos/t2782.scala
+++ b/tests/untried/pos/t2782.scala
@@ -4,9 +4,9 @@ object Test {
   trait Foo[T]
 
   // Haven't managed to repro without using a CanBuild or CanBuildFrom implicit parameter
-  implicit def MapFoo[A, B, M[A, B] <: sc.Map[A,B]](implicit aFoo: Foo[A], bFoo: Foo[B], cb: sc.generic.CanBuild[(A, B), M[A, B]]) = new Foo[M[A,B]] {}
+  implicit def MapFoo[A, B, M[A, B] <: sc.Map[A,B]](implicit aFoo: Foo[A], bFoo: Foo[B], cb: sc.generic.CanBuild[(A, B), M[A, B]]): Test.Foo[M[A,B]] = new Foo[M[A,B]] {}
   implicit object Tuple2IntIntFoo extends Foo[(Int, Int)] // no difference if this line is uncommented
-  implicit def Tuple2Foo[A, B] = new Foo[(A, B)] {}       // nor this one
+  implicit def Tuple2Foo[A, B]: Test.Foo[(A, B)] = new Foo[(A, B)] {}       // nor this one
 
   implicitly[Foo[(Int, Int)]]
 }
diff --git a/tests/untried/pos/t2913.scala b/tests/untried/pos/t2913.scala
index 6366548c6208..55b72bed4893 100755
--- a/tests/untried/pos/t2913.scala
+++ b/tests/untried/pos/t2913.scala
@@ -10,7 +10,7 @@ class RichA {
 
 object Test {
 
-  implicit def AToRichA(a: A) = new RichA
+  implicit def AToRichA(a: A): RichA = new RichA
 
   val a = new A
   a.foo()
@@ -36,7 +36,7 @@ object test1 {
     def apply(t : T) = (s:T2) => f(t,s)
     def apply(p : (T,T2)) = f(p._1,p._2)
   }
-  implicit def g[T](f : (T,String) => String) = Foo(f)
+  implicit def g[T](f : (T,String) => String): test1.Foo[T,String] = Foo(f)
   def main(args : Array[String]) : Unit = {
     val f = (x:Int,s:String) => s + x
     println(f(1))
@@ -46,7 +46,7 @@ object test1 {
 object Main {
   def main(args : Array[String]): Unit = {
     val fn = (a : Int, str : String) => "a: " + a + ", str: " + str
-    implicit def fx[T](f : (T,String) => String) = (x:T) => f(x,null)
+    implicit def fx[T](f : (T,String) => String): T => String = (x:T) => f(x,null)
     println(fn(1))
     ()
   }
diff --git a/tests/untried/pos/t3177.scala b/tests/untried/pos/t3177.scala
index 9b850966db71..12dfce6eea03 100644
--- a/tests/untried/pos/t3177.scala
+++ b/tests/untried/pos/t3177.scala
@@ -5,7 +5,7 @@ trait InvariantFunctor[F[_]] {
 object InvariantFunctor {
   import Endo._
 
-  implicit val EndoInvariantFunctor = new InvariantFunctor[Endo] {
+  implicit val EndoInvariantFunctor: InvariantFunctor[Endo] = new InvariantFunctor[Endo] {
     def xmap[A, B](ma: Endo[A], f: A => B, g: B => A): Endo[B] = (b: B) => f(ma(g(b)))
   }
 
diff --git a/tests/untried/pos/t3373.scala b/tests/untried/pos/t3373.scala
index 91768e201df1..b6594fb6c7dc 100644
--- a/tests/untried/pos/t3373.scala
+++ b/tests/untried/pos/t3373.scala
@@ -5,7 +5,7 @@ class Entry(time: Long) {
 object Test {
   def extractTime(e: Entry) = e.getTime
 
-  implicit val orderEntries = new Ordering[Entry] {
+  implicit val orderEntries: Ordering[Entry] = new Ordering[Entry] {
    def compare(first: Entry, second: Entry) = extractTime(first) compare extractTime(second)
   }
 }
diff --git a/tests/untried/pos/t3808.scala b/tests/untried/pos/t3808.scala
index 8162fce72f58..ec95fed4d997 100644
--- a/tests/untried/pos/t3808.scala
+++ b/tests/untried/pos/t3808.scala
@@ -1,7 +1,7 @@
 object Test {
   def meh: Unit = {
     trait TC[I]
-    implicit val tci = new TC[Int]{}
+    implicit val tci: TC[Int] = new TC[Int]{}
 
     def baz[J : TC] : String = "meh"
 
diff --git a/tests/untried/pos/t3999/a_1.scala b/tests/untried/pos/t3999/a_1.scala
index 54c1b86ce373..be9cc371e9dc 100644
--- a/tests/untried/pos/t3999/a_1.scala
+++ b/tests/untried/pos/t3999/a_1.scala
@@ -4,6 +4,6 @@ class Outside
 
 package object bar {
   class Val(b: Boolean)
-  implicit def boolean2Val(b: Boolean) = new Val(b)
-  implicit def boolean2Outside(b: Boolean) = new Outside
+  implicit def boolean2Val(b: Boolean): foo.bar.package.Val = new Val(b)
+  implicit def boolean2Outside(b: Boolean): foo.Outside = new Outside
 }
diff --git a/tests/untried/pos/t4273.scala b/tests/untried/pos/t4273.scala
index ed2c6277098d..8c4cbbbafce1 100644
--- a/tests/untried/pos/t4273.scala
+++ b/tests/untried/pos/t4273.scala
@@ -1,8 +1,8 @@
 class A {
-  implicit def compareComparables[T](x: T)(implicit ord: Ordering[T]) = new ord.Ops(x)
+  implicit def compareComparables[T](x: T)(implicit ord: Ordering[T]): ord.Ops = new ord.Ops(x)
 
   class Bippy
-  implicit val bippyOrdering = new Ordering[Bippy] { def compare(x: Bippy, y: Bippy) = util.Random.nextInt }
+  implicit val bippyOrdering: Ordering[A.this.Bippy] = new Ordering[Bippy] { def compare(x: Bippy, y: Bippy) = util.Random.nextInt }
 
   (new Bippy) < (new Bippy)
 }
diff --git a/tests/untried/pos/t4457_1.scala b/tests/untried/pos/t4457_1.scala
index 7192d97f4676..b2a4e301b9cc 100644
--- a/tests/untried/pos/t4457_1.scala
+++ b/tests/untried/pos/t4457_1.scala
@@ -6,10 +6,10 @@ object ImplicitConvAmbiguity2 {
   class AA[A]
   class BB[A]
 
-  implicit def conv1(i: Float) = new NE[Float]
-  implicit def conv3(op: AA[java.util.TooManyListenersException]) = new N[java.util.TooManyListenersException]
-  implicit def conv4(op: AA[Float]) = new N[Float]
-  implicit def conv5(e: BB[java.util.GregorianCalendar]) = new N[java.util.GregorianCalendar]
+  implicit def conv1(i: Float): ImplicitConvAmbiguity2.NE[Float] = new NE[Float]
+  implicit def conv3(op: AA[java.util.TooManyListenersException]): ImplicitConvAmbiguity2.N[java.util.TooManyListenersException] = new N[java.util.TooManyListenersException]
+  implicit def conv4(op: AA[Float]): ImplicitConvAmbiguity2.N[Float] = new N[Float]
+  implicit def conv5(e: BB[java.util.GregorianCalendar]): ImplicitConvAmbiguity2.N[java.util.GregorianCalendar] = new N[java.util.GregorianCalendar]
 
   def aFunc[A](a: NE[A]) = new AA[A]
   def aFunc[A](a: NN[A]) = new BB[A]
diff --git a/tests/untried/pos/t4975.scala b/tests/untried/pos/t4975.scala
index 97ed9369ea8c..3339631dc345 100644
--- a/tests/untried/pos/t4975.scala
+++ b/tests/untried/pos/t4975.scala
@@ -4,7 +4,7 @@ object ImplicitScope {
   def foo: Unit = {
     trait B
     object B {
-      implicit def ab = new A[B]
+      implicit def ab: ImplicitScope.A[B] = new A[B]
     }
 
     implicitly[A[B]]  // Error
diff --git a/tests/untried/pos/t5156.scala b/tests/untried/pos/t5156.scala
index 129e97a5224a..41b1c296e1bd 100644
--- a/tests/untried/pos/t5156.scala
+++ b/tests/untried/pos/t5156.scala
@@ -6,14 +6,14 @@ object HList {
   type ::[H, T <: HList] = HCons[H, T]
   type HNil = HNil.type
 
-  implicit def hlistOps[L <: HList](l : L) = new {
+  implicit def hlistOps[L <: HList](l : L): AnyRef{def ::[H](h: H): HList.::[H,L]; def last(implicit last: HList.Last[L]): Unit} = new {
     def ::[H](h : H) : H :: L = HCons(h, l)
     def last(implicit last : Last[L]): Unit = {}
   }
 
   class Last[L <: HList]
-  implicit def hsingleLast[H] = new Last[H :: HNil]
-  implicit def hlistLast[H, T <: HList](implicit lt : Last[T]) = new Last[H :: T]
+  implicit def hsingleLast[H]: HList.Last[HList.::[H,HList.HNil]] = new Last[H :: HNil]
+  implicit def hlistLast[H, T <: HList](implicit lt : Last[T]): HList.Last[HList.::[H,T]] = new Last[H :: T]
 
   type III = Int :: Int :: Int :: HNil
   val iii : III = 0 :: 0 :: 0 :: HNil
diff --git a/tests/untried/pos/t5892.scala b/tests/untried/pos/t5892.scala
index 26dd1f73da9a..ac383f8c1848 100644
--- a/tests/untried/pos/t5892.scala
+++ b/tests/untried/pos/t5892.scala
@@ -1,5 +1,5 @@
 class foo(a: String) extends annotation.StaticAnnotation
 object o {
-  implicit def i2s(i: Int) = ""
+  implicit def i2s(i: Int): String = ""
   @foo(1: String) def blerg: Unit = { }
 }
diff --git a/tests/untried/pos/t6201.scala b/tests/untried/pos/t6201.scala
index 9d6667b6fdde..900a267fb07a 100644
--- a/tests/untried/pos/t6201.scala
+++ b/tests/untried/pos/t6201.scala
@@ -12,8 +12,8 @@ class Test {
   class Foo2 {
     def must(x: Int) = ()
   }
-  implicit def toFoo1(s: Elem) = new Foo1()
-  implicit def toFoo2(s: Elem) = new Foo2()
+  implicit def toFoo1(s: Elem): Test.this.Foo1 = new Foo1()
+  implicit def toFoo2(s: Elem): Test.this.Foo2 = new Foo2()
 
   def is: Unit = { (elem) }
 }
diff --git a/tests/untried/pos/t628.scala b/tests/untried/pos/t628.scala
index f32c1cad0f4a..9a531a0cddc6 100644
--- a/tests/untried/pos/t628.scala
+++ b/tests/untried/pos/t628.scala
@@ -7,7 +7,7 @@ object Test {
     def *(newUnit: Unit): Measure = Measure(scalar, newUnit)
   }
 
-  implicit def double2Measure(scalar: Double) =
+  implicit def double2Measure(scalar: Double): Test.Measure =
     Measure(scalar, NoUnit)
 
 
diff --git a/tests/untried/pos/t6556.scala b/tests/untried/pos/t6556.scala
index e1a6f49b8614..13560e8bafe7 100644
--- a/tests/untried/pos/t6556.scala
+++ b/tests/untried/pos/t6556.scala
@@ -7,7 +7,7 @@ trait Adapter[X] {self =>
 }
 
 object Adapter {
-  implicit def adaptee[Adaptee](adapter: Adapter[Adaptee]) = adapter.adaptee
+  implicit def adaptee[Adaptee](adapter: Adapter[Adaptee]): Adaptee = adapter.adaptee
 }
 
 
diff --git a/tests/untried/pos/t7180.scala b/tests/untried/pos/t7180.scala
index 15582f6df370..e46d29f474cd 100644
--- a/tests/untried/pos/t7180.scala
+++ b/tests/untried/pos/t7180.scala
@@ -2,7 +2,7 @@ trait Higher[F[_]]
 
 trait Box[A]
 object Box {
-  implicit def HigherBox = new Higher[Box] {}
+  implicit def HigherBox: Higher[Box] = new Higher[Box] {}
 }
 
 object Foo {
diff --git a/tests/untried/pos/t7486-named.scala b/tests/untried/pos/t7486-named.scala
index 253293e5f17e..05c1c02782e4 100644
--- a/tests/untried/pos/t7486-named.scala
+++ b/tests/untried/pos/t7486-named.scala
@@ -1,7 +1,7 @@
 
 object Test {
   def fold(empty: Any) = ()
-  implicit val notAnnotatedImplicit = new {
+  implicit val notAnnotatedImplicit: AnyRef{def empty[A]: Any} = new {
     fold(empty = 0)
     def empty[A]: Any = ???
   }
diff --git a/tests/untried/pos/t7486.scala b/tests/untried/pos/t7486.scala
index 6dd7f4c4ac8e..6ad096c7c7cf 100644
--- a/tests/untried/pos/t7486.scala
+++ b/tests/untried/pos/t7486.scala
@@ -1,7 +1,7 @@
 object Test{
   var locker = 0
   // remove implicit, or change to `locker = locker + 1` to make it compile.
-  implicit val davyJones0 = {
+  implicit val davyJones0: Int = {
     locker += 0
     0
   }
diff --git a/tests/untried/pos/t8219b.scala b/tests/untried/pos/t8219b.scala
index d55d3139e197..b820447ce1fd 100644
--- a/tests/untried/pos/t8219b.scala
+++ b/tests/untried/pos/t8219b.scala
@@ -42,8 +42,8 @@ class Broken {
   }
   in {
     import scala.None
-    implicit def any2str1(a: Any) = ""
-    implicit def any2str2(a: Any) = ""
+    implicit def any2str1(a: Any): String = ""
+    implicit def any2str2(a: Any): String = ""
     T.foo("")
   }
 }
diff --git a/tests/untried/pos/tcpoly_infer_ticket1864.scala b/tests/untried/pos/tcpoly_infer_ticket1864.scala
index 70cfac06291b..4b7c7a2238d3 100644
--- a/tests/untried/pos/tcpoly_infer_ticket1864.scala
+++ b/tests/untried/pos/tcpoly_infer_ticket1864.scala
@@ -36,7 +36,7 @@ object App {
     implicit def richBuffer[T, B[U] <: Buffer[U]](buffer: B[T]): RichBuffer[T, B] =
       new RichBuffer[T, B](buffer)
 
-    implicit val rv = new ArrayBuffer[Int]
+    implicit val rv: scala.collection.mutable.ArrayBuffer[Int] = new ArrayBuffer[Int]
     val buf = new ArrayBuffer[Int]
     (1 to 5).foreach(buf += _)
     buf.mymap(x => x*x)
diff --git a/tests/untried/pos/ticket2201.scala b/tests/untried/pos/ticket2201.scala
index 21af170cf1d4..96b7b4a3d493 100644
--- a/tests/untried/pos/ticket2201.scala
+++ b/tests/untried/pos/ticket2201.scala
@@ -1,5 +1,5 @@
 class Test
-object Test { implicit def view(x : Test) = 0 }
+object Test { implicit def view(x : Test): Int = 0 }
 
 object Call {
   def call(implicit view : Test => Int) = view(null)

From 24ac35546c2c159403e91144e0e4add585ee9ae5 Mon Sep 17 00:00:00 2001
From: Samuel Gruetter <samuel.gruetter@epfl.ch>
Date: Wed, 19 Mar 2014 17:36:59 +0100
Subject: [PATCH 2/3] apply srewrite (no procedure syntax for constructors) to
 tests/untried/neg

---
 tests/untried/neg/t5543.scala             | 8 ++++----
 tests/untried/neg/t6666.scala             | 2 +-
 tests/untried/neg/t7605-deprecation.scala | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/untried/neg/t5543.scala b/tests/untried/neg/t5543.scala
index 4e03e6e11470..8fa4ef36f307 100644
--- a/tests/untried/neg/t5543.scala
+++ b/tests/untried/neg/t5543.scala
@@ -1,19 +1,19 @@
 class C1 {
   type T
-  def this(x: T) { this() }
+  def this(x: T) = { this() }
 }
 
 class C1a[T] {
-  def this(x: T) { this() } // works, no error here
+  def this(x: T) = { this() } // works, no error here
 }
 
 class C2(x: Int) {
-   def this(a: Int, b: Int = x) {
+   def this(a: Int, b: Int = x) = {
      this(b)
   }
 }
 
 class C3 {
   val x = 0
-  def this(a: Int = x) { this() }
+  def this(a: Int = x) = { this() }
 }
diff --git a/tests/untried/neg/t6666.scala b/tests/untried/neg/t6666.scala
index 2495c8727d52..01d0c0d9ee61 100644
--- a/tests/untried/neg/t6666.scala
+++ b/tests/untried/neg/t6666.scala
@@ -5,7 +5,7 @@ object F {
 }
 
 class COkay extends C(0) {
-  def this(a: Any) {
+  def this(a: Any) = {
     this()
     def x = "".toString
     F.byname(x)
diff --git a/tests/untried/neg/t7605-deprecation.scala b/tests/untried/neg/t7605-deprecation.scala
index 30cd21bd69bf..214f32437f03 100644
--- a/tests/untried/neg/t7605-deprecation.scala
+++ b/tests/untried/neg/t7605-deprecation.scala
@@ -3,6 +3,6 @@ abstract class Foo {
   def baz
   def boo(i: Int, l: Long)
   def boz(i: Int, l: Long): Unit = {}
-  def this(i: Int) { this() } // Don't complain here!
+  def this(i: Int) = { this() } // Don't complain here!
   def foz: Unit               // Don't complain here!
 }

From d51d08b444e0ea4a2c13b4daf0ce14b53bfbad89 Mon Sep 17 00:00:00 2001
From: Samuel Gruetter <samuel.gruetter@epfl.ch>
Date: Wed, 19 Mar 2014 17:53:49 +0100
Subject: [PATCH 3/3] move all tests in tests/untried/neg which use implicits
 to tests/untried/neg-with-implicits

---
 .../classmanifests_new_deprecations.scala                         | 0
 .../untried/{neg => neg-with-implicits}/compile-time-only-a.scala | 0
 .../untried/{neg => neg-with-implicits}/divergent-implicit.scala  | 0
 .../untried/{neg => neg-with-implicits}/forgot-interpolator.scala | 0
 tests/untried/{neg => neg-with-implicits}/implicit-shadow.scala   | 0
 tests/untried/{neg => neg-with-implicits}/implicits.scala         | 0
 tests/untried/{neg => neg-with-implicits}/logImplicits.scala      | 0
 .../macro-blackbox-dynamic-materialization/Macros_1.scala         | 0
 .../macro-blackbox-dynamic-materialization/Test_2.scala           | 0
 .../macro-blackbox-fundep-materialization/Macros_1.scala          | 0
 .../macro-blackbox-fundep-materialization/Test_2.scala            | 0
 .../macro-bundle-whitebox-use-raw/Macros_1.scala                  | 0
 .../macro-bundle-whitebox-use-raw/Test_2.scala                    | 0
 .../macro-bundle-whitebox-use-refined/Macros_1.scala              | 0
 .../macro-bundle-whitebox-use-refined/Test_2.scala                | 0
 .../{neg => neg-with-implicits}/macro-cyclic/Impls_Macros_1.scala | 0
 .../macro-divergence-controlled/Impls_Macros_1.scala              | 0
 .../macro-divergence-controlled/Test_2.scala                      | 0
 .../{neg => neg-with-implicits}/macro-invalidsig/Impls_1.scala    | 0
 .../macro-invalidsig/Macros_Test_2.scala                          | 0
 .../untried/{neg => neg-with-implicits}/overloaded-implicit.scala | 0
 .../{neg => neg-with-implicits}/patmat-classtag-compound.scala    | 0
 .../untried/{neg => neg-with-implicits}/sammy_restrictions.scala  | 0
 tests/untried/{neg => neg-with-implicits}/sensitive2.scala        | 0
 .../stringinterpolation_macro-neg.scala                           | 0
 tests/untried/{neg => neg-with-implicits}/t0226.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t0590.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t1038.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t2206.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t2316.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t2405.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t2421b.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t3006.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t3224.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t3346b.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t3346c.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t3346i.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t3453.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t3653.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t3692-new.scala         | 0
 tests/untried/{neg => neg-with-implicits}/t3776.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t3854.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t3977.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t3995.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t4079/t4079_1.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t4079/t4079_2.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t4270.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t4271.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t4457_1.scala           | 0
 tests/untried/{neg => neg-with-implicits}/t4457_2.scala           | 0
 tests/untried/{neg => neg-with-implicits}/t4568.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t4882.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5318.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5318b.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t5318c.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t5340.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5354.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5376.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t550.scala              | 0
 tests/untried/{neg => neg-with-implicits}/t5553_2.scala           | 0
 tests/untried/{neg => neg-with-implicits}/t5554.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5578.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5728.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5801.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5803.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5839.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5892.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t5903a/Macros_1.scala   | 0
 tests/untried/{neg => neg-with-implicits}/t5903a/Test_2.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t5903b/Macros_1.scala   | 0
 tests/untried/{neg => neg-with-implicits}/t5903b/Test_2.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t5903c/Macros_1.scala   | 0
 tests/untried/{neg => neg-with-implicits}/t5903c/Test_2.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t5903d/Macros_1.scala   | 0
 tests/untried/{neg => neg-with-implicits}/t5903d/Test_2.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t5903e/Macros_1.scala   | 0
 tests/untried/{neg => neg-with-implicits}/t5903e/Test_2.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t591.scala              | 0
 tests/untried/{neg => neg-with-implicits}/t6074.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6083.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6120.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6227.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6263.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t631.scala              | 0
 tests/untried/{neg => neg-with-implicits}/t6335.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6436.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6436b.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t6567.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6597.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6666d.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t6667.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t6667b.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t6889.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t692.scala              | 0
 tests/untried/{neg => neg-with-implicits}/t6931/Macros_1.scala    | 0
 tests/untried/{neg => neg-with-implicits}/t6931/Test_2.scala      | 0
 tests/untried/{neg => neg-with-implicits}/t696.scala              | 0
 tests/untried/{neg => neg-with-implicits}/t712.scala              | 0
 tests/untried/{neg => neg-with-implicits}/t7289.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t7289_status_quo.scala  | 0
 tests/untried/{neg => neg-with-implicits}/t729.scala              | 0
 tests/untried/{neg => neg-with-implicits}/t7509.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t7519-b/Mac_1.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t7519-b/Use_2.scala     | 0
 tests/untried/{neg => neg-with-implicits}/t7519.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t7721.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t8024.scala             | 0
 tests/untried/{neg => neg-with-implicits}/t8024b.scala            | 0
 tests/untried/{neg => neg-with-implicits}/t8104/Macros_1.scala    | 0
 tests/untried/{neg => neg-with-implicits}/t8104/Test_2.scala      | 0
 tests/untried/{neg => neg-with-implicits}/t8372.scala             | 0
 tests/untried/{neg => neg-with-implicits}/viewtest.scala          | 0
 .../untried/{neg => neg-with-implicits}/warn-unused-imports.scala | 0
 113 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/untried/{neg => neg-with-implicits}/classmanifests_new_deprecations.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/compile-time-only-a.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/divergent-implicit.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/forgot-interpolator.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/implicit-shadow.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/implicits.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/logImplicits.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-blackbox-dynamic-materialization/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-blackbox-dynamic-materialization/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-blackbox-fundep-materialization/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-blackbox-fundep-materialization/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-bundle-whitebox-use-raw/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-bundle-whitebox-use-raw/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-bundle-whitebox-use-refined/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-bundle-whitebox-use-refined/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-cyclic/Impls_Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-divergence-controlled/Impls_Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-divergence-controlled/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-invalidsig/Impls_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/macro-invalidsig/Macros_Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/overloaded-implicit.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/patmat-classtag-compound.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/sammy_restrictions.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/sensitive2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/stringinterpolation_macro-neg.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t0226.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t0590.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t1038.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t2206.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t2316.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t2405.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t2421b.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3006.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3224.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3346b.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3346c.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3346i.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3453.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3653.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3692-new.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3776.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3854.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3977.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t3995.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t4079/t4079_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t4079/t4079_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t4270.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t4271.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t4457_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t4457_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t4568.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t4882.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5318.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5318b.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5318c.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5340.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5354.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5376.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t550.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5553_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5554.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5578.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5728.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5801.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5803.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5839.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5892.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903a/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903a/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903b/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903b/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903c/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903c/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903d/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903d/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903e/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t5903e/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t591.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6074.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6083.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6120.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6227.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6263.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t631.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6335.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6436.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6436b.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6567.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6597.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6666d.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6667.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6667b.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6889.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t692.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6931/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t6931/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t696.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t712.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t7289.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t7289_status_quo.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t729.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t7509.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t7519-b/Mac_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t7519-b/Use_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t7519.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t7721.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t8024.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t8024b.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t8104/Macros_1.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t8104/Test_2.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/t8372.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/viewtest.scala (100%)
 rename tests/untried/{neg => neg-with-implicits}/warn-unused-imports.scala (100%)

diff --git a/tests/untried/neg/classmanifests_new_deprecations.scala b/tests/untried/neg-with-implicits/classmanifests_new_deprecations.scala
similarity index 100%
rename from tests/untried/neg/classmanifests_new_deprecations.scala
rename to tests/untried/neg-with-implicits/classmanifests_new_deprecations.scala
diff --git a/tests/untried/neg/compile-time-only-a.scala b/tests/untried/neg-with-implicits/compile-time-only-a.scala
similarity index 100%
rename from tests/untried/neg/compile-time-only-a.scala
rename to tests/untried/neg-with-implicits/compile-time-only-a.scala
diff --git a/tests/untried/neg/divergent-implicit.scala b/tests/untried/neg-with-implicits/divergent-implicit.scala
similarity index 100%
rename from tests/untried/neg/divergent-implicit.scala
rename to tests/untried/neg-with-implicits/divergent-implicit.scala
diff --git a/tests/untried/neg/forgot-interpolator.scala b/tests/untried/neg-with-implicits/forgot-interpolator.scala
similarity index 100%
rename from tests/untried/neg/forgot-interpolator.scala
rename to tests/untried/neg-with-implicits/forgot-interpolator.scala
diff --git a/tests/untried/neg/implicit-shadow.scala b/tests/untried/neg-with-implicits/implicit-shadow.scala
similarity index 100%
rename from tests/untried/neg/implicit-shadow.scala
rename to tests/untried/neg-with-implicits/implicit-shadow.scala
diff --git a/tests/untried/neg/implicits.scala b/tests/untried/neg-with-implicits/implicits.scala
similarity index 100%
rename from tests/untried/neg/implicits.scala
rename to tests/untried/neg-with-implicits/implicits.scala
diff --git a/tests/untried/neg/logImplicits.scala b/tests/untried/neg-with-implicits/logImplicits.scala
similarity index 100%
rename from tests/untried/neg/logImplicits.scala
rename to tests/untried/neg-with-implicits/logImplicits.scala
diff --git a/tests/untried/neg/macro-blackbox-dynamic-materialization/Macros_1.scala b/tests/untried/neg-with-implicits/macro-blackbox-dynamic-materialization/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/macro-blackbox-dynamic-materialization/Macros_1.scala
rename to tests/untried/neg-with-implicits/macro-blackbox-dynamic-materialization/Macros_1.scala
diff --git a/tests/untried/neg/macro-blackbox-dynamic-materialization/Test_2.scala b/tests/untried/neg-with-implicits/macro-blackbox-dynamic-materialization/Test_2.scala
similarity index 100%
rename from tests/untried/neg/macro-blackbox-dynamic-materialization/Test_2.scala
rename to tests/untried/neg-with-implicits/macro-blackbox-dynamic-materialization/Test_2.scala
diff --git a/tests/untried/neg/macro-blackbox-fundep-materialization/Macros_1.scala b/tests/untried/neg-with-implicits/macro-blackbox-fundep-materialization/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/macro-blackbox-fundep-materialization/Macros_1.scala
rename to tests/untried/neg-with-implicits/macro-blackbox-fundep-materialization/Macros_1.scala
diff --git a/tests/untried/neg/macro-blackbox-fundep-materialization/Test_2.scala b/tests/untried/neg-with-implicits/macro-blackbox-fundep-materialization/Test_2.scala
similarity index 100%
rename from tests/untried/neg/macro-blackbox-fundep-materialization/Test_2.scala
rename to tests/untried/neg-with-implicits/macro-blackbox-fundep-materialization/Test_2.scala
diff --git a/tests/untried/neg/macro-bundle-whitebox-use-raw/Macros_1.scala b/tests/untried/neg-with-implicits/macro-bundle-whitebox-use-raw/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/macro-bundle-whitebox-use-raw/Macros_1.scala
rename to tests/untried/neg-with-implicits/macro-bundle-whitebox-use-raw/Macros_1.scala
diff --git a/tests/untried/neg/macro-bundle-whitebox-use-raw/Test_2.scala b/tests/untried/neg-with-implicits/macro-bundle-whitebox-use-raw/Test_2.scala
similarity index 100%
rename from tests/untried/neg/macro-bundle-whitebox-use-raw/Test_2.scala
rename to tests/untried/neg-with-implicits/macro-bundle-whitebox-use-raw/Test_2.scala
diff --git a/tests/untried/neg/macro-bundle-whitebox-use-refined/Macros_1.scala b/tests/untried/neg-with-implicits/macro-bundle-whitebox-use-refined/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/macro-bundle-whitebox-use-refined/Macros_1.scala
rename to tests/untried/neg-with-implicits/macro-bundle-whitebox-use-refined/Macros_1.scala
diff --git a/tests/untried/neg/macro-bundle-whitebox-use-refined/Test_2.scala b/tests/untried/neg-with-implicits/macro-bundle-whitebox-use-refined/Test_2.scala
similarity index 100%
rename from tests/untried/neg/macro-bundle-whitebox-use-refined/Test_2.scala
rename to tests/untried/neg-with-implicits/macro-bundle-whitebox-use-refined/Test_2.scala
diff --git a/tests/untried/neg/macro-cyclic/Impls_Macros_1.scala b/tests/untried/neg-with-implicits/macro-cyclic/Impls_Macros_1.scala
similarity index 100%
rename from tests/untried/neg/macro-cyclic/Impls_Macros_1.scala
rename to tests/untried/neg-with-implicits/macro-cyclic/Impls_Macros_1.scala
diff --git a/tests/untried/neg/macro-divergence-controlled/Impls_Macros_1.scala b/tests/untried/neg-with-implicits/macro-divergence-controlled/Impls_Macros_1.scala
similarity index 100%
rename from tests/untried/neg/macro-divergence-controlled/Impls_Macros_1.scala
rename to tests/untried/neg-with-implicits/macro-divergence-controlled/Impls_Macros_1.scala
diff --git a/tests/untried/neg/macro-divergence-controlled/Test_2.scala b/tests/untried/neg-with-implicits/macro-divergence-controlled/Test_2.scala
similarity index 100%
rename from tests/untried/neg/macro-divergence-controlled/Test_2.scala
rename to tests/untried/neg-with-implicits/macro-divergence-controlled/Test_2.scala
diff --git a/tests/untried/neg/macro-invalidsig/Impls_1.scala b/tests/untried/neg-with-implicits/macro-invalidsig/Impls_1.scala
similarity index 100%
rename from tests/untried/neg/macro-invalidsig/Impls_1.scala
rename to tests/untried/neg-with-implicits/macro-invalidsig/Impls_1.scala
diff --git a/tests/untried/neg/macro-invalidsig/Macros_Test_2.scala b/tests/untried/neg-with-implicits/macro-invalidsig/Macros_Test_2.scala
similarity index 100%
rename from tests/untried/neg/macro-invalidsig/Macros_Test_2.scala
rename to tests/untried/neg-with-implicits/macro-invalidsig/Macros_Test_2.scala
diff --git a/tests/untried/neg/overloaded-implicit.scala b/tests/untried/neg-with-implicits/overloaded-implicit.scala
similarity index 100%
rename from tests/untried/neg/overloaded-implicit.scala
rename to tests/untried/neg-with-implicits/overloaded-implicit.scala
diff --git a/tests/untried/neg/patmat-classtag-compound.scala b/tests/untried/neg-with-implicits/patmat-classtag-compound.scala
similarity index 100%
rename from tests/untried/neg/patmat-classtag-compound.scala
rename to tests/untried/neg-with-implicits/patmat-classtag-compound.scala
diff --git a/tests/untried/neg/sammy_restrictions.scala b/tests/untried/neg-with-implicits/sammy_restrictions.scala
similarity index 100%
rename from tests/untried/neg/sammy_restrictions.scala
rename to tests/untried/neg-with-implicits/sammy_restrictions.scala
diff --git a/tests/untried/neg/sensitive2.scala b/tests/untried/neg-with-implicits/sensitive2.scala
similarity index 100%
rename from tests/untried/neg/sensitive2.scala
rename to tests/untried/neg-with-implicits/sensitive2.scala
diff --git a/tests/untried/neg/stringinterpolation_macro-neg.scala b/tests/untried/neg-with-implicits/stringinterpolation_macro-neg.scala
similarity index 100%
rename from tests/untried/neg/stringinterpolation_macro-neg.scala
rename to tests/untried/neg-with-implicits/stringinterpolation_macro-neg.scala
diff --git a/tests/untried/neg/t0226.scala b/tests/untried/neg-with-implicits/t0226.scala
similarity index 100%
rename from tests/untried/neg/t0226.scala
rename to tests/untried/neg-with-implicits/t0226.scala
diff --git a/tests/untried/neg/t0590.scala b/tests/untried/neg-with-implicits/t0590.scala
similarity index 100%
rename from tests/untried/neg/t0590.scala
rename to tests/untried/neg-with-implicits/t0590.scala
diff --git a/tests/untried/neg/t1038.scala b/tests/untried/neg-with-implicits/t1038.scala
similarity index 100%
rename from tests/untried/neg/t1038.scala
rename to tests/untried/neg-with-implicits/t1038.scala
diff --git a/tests/untried/neg/t2206.scala b/tests/untried/neg-with-implicits/t2206.scala
similarity index 100%
rename from tests/untried/neg/t2206.scala
rename to tests/untried/neg-with-implicits/t2206.scala
diff --git a/tests/untried/neg/t2316.scala b/tests/untried/neg-with-implicits/t2316.scala
similarity index 100%
rename from tests/untried/neg/t2316.scala
rename to tests/untried/neg-with-implicits/t2316.scala
diff --git a/tests/untried/neg/t2405.scala b/tests/untried/neg-with-implicits/t2405.scala
similarity index 100%
rename from tests/untried/neg/t2405.scala
rename to tests/untried/neg-with-implicits/t2405.scala
diff --git a/tests/untried/neg/t2421b.scala b/tests/untried/neg-with-implicits/t2421b.scala
similarity index 100%
rename from tests/untried/neg/t2421b.scala
rename to tests/untried/neg-with-implicits/t2421b.scala
diff --git a/tests/untried/neg/t3006.scala b/tests/untried/neg-with-implicits/t3006.scala
similarity index 100%
rename from tests/untried/neg/t3006.scala
rename to tests/untried/neg-with-implicits/t3006.scala
diff --git a/tests/untried/neg/t3224.scala b/tests/untried/neg-with-implicits/t3224.scala
similarity index 100%
rename from tests/untried/neg/t3224.scala
rename to tests/untried/neg-with-implicits/t3224.scala
diff --git a/tests/untried/neg/t3346b.scala b/tests/untried/neg-with-implicits/t3346b.scala
similarity index 100%
rename from tests/untried/neg/t3346b.scala
rename to tests/untried/neg-with-implicits/t3346b.scala
diff --git a/tests/untried/neg/t3346c.scala b/tests/untried/neg-with-implicits/t3346c.scala
similarity index 100%
rename from tests/untried/neg/t3346c.scala
rename to tests/untried/neg-with-implicits/t3346c.scala
diff --git a/tests/untried/neg/t3346i.scala b/tests/untried/neg-with-implicits/t3346i.scala
similarity index 100%
rename from tests/untried/neg/t3346i.scala
rename to tests/untried/neg-with-implicits/t3346i.scala
diff --git a/tests/untried/neg/t3453.scala b/tests/untried/neg-with-implicits/t3453.scala
similarity index 100%
rename from tests/untried/neg/t3453.scala
rename to tests/untried/neg-with-implicits/t3453.scala
diff --git a/tests/untried/neg/t3653.scala b/tests/untried/neg-with-implicits/t3653.scala
similarity index 100%
rename from tests/untried/neg/t3653.scala
rename to tests/untried/neg-with-implicits/t3653.scala
diff --git a/tests/untried/neg/t3692-new.scala b/tests/untried/neg-with-implicits/t3692-new.scala
similarity index 100%
rename from tests/untried/neg/t3692-new.scala
rename to tests/untried/neg-with-implicits/t3692-new.scala
diff --git a/tests/untried/neg/t3776.scala b/tests/untried/neg-with-implicits/t3776.scala
similarity index 100%
rename from tests/untried/neg/t3776.scala
rename to tests/untried/neg-with-implicits/t3776.scala
diff --git a/tests/untried/neg/t3854.scala b/tests/untried/neg-with-implicits/t3854.scala
similarity index 100%
rename from tests/untried/neg/t3854.scala
rename to tests/untried/neg-with-implicits/t3854.scala
diff --git a/tests/untried/neg/t3977.scala b/tests/untried/neg-with-implicits/t3977.scala
similarity index 100%
rename from tests/untried/neg/t3977.scala
rename to tests/untried/neg-with-implicits/t3977.scala
diff --git a/tests/untried/neg/t3995.scala b/tests/untried/neg-with-implicits/t3995.scala
similarity index 100%
rename from tests/untried/neg/t3995.scala
rename to tests/untried/neg-with-implicits/t3995.scala
diff --git a/tests/untried/neg/t4079/t4079_1.scala b/tests/untried/neg-with-implicits/t4079/t4079_1.scala
similarity index 100%
rename from tests/untried/neg/t4079/t4079_1.scala
rename to tests/untried/neg-with-implicits/t4079/t4079_1.scala
diff --git a/tests/untried/neg/t4079/t4079_2.scala b/tests/untried/neg-with-implicits/t4079/t4079_2.scala
similarity index 100%
rename from tests/untried/neg/t4079/t4079_2.scala
rename to tests/untried/neg-with-implicits/t4079/t4079_2.scala
diff --git a/tests/untried/neg/t4270.scala b/tests/untried/neg-with-implicits/t4270.scala
similarity index 100%
rename from tests/untried/neg/t4270.scala
rename to tests/untried/neg-with-implicits/t4270.scala
diff --git a/tests/untried/neg/t4271.scala b/tests/untried/neg-with-implicits/t4271.scala
similarity index 100%
rename from tests/untried/neg/t4271.scala
rename to tests/untried/neg-with-implicits/t4271.scala
diff --git a/tests/untried/neg/t4457_1.scala b/tests/untried/neg-with-implicits/t4457_1.scala
similarity index 100%
rename from tests/untried/neg/t4457_1.scala
rename to tests/untried/neg-with-implicits/t4457_1.scala
diff --git a/tests/untried/neg/t4457_2.scala b/tests/untried/neg-with-implicits/t4457_2.scala
similarity index 100%
rename from tests/untried/neg/t4457_2.scala
rename to tests/untried/neg-with-implicits/t4457_2.scala
diff --git a/tests/untried/neg/t4568.scala b/tests/untried/neg-with-implicits/t4568.scala
similarity index 100%
rename from tests/untried/neg/t4568.scala
rename to tests/untried/neg-with-implicits/t4568.scala
diff --git a/tests/untried/neg/t4882.scala b/tests/untried/neg-with-implicits/t4882.scala
similarity index 100%
rename from tests/untried/neg/t4882.scala
rename to tests/untried/neg-with-implicits/t4882.scala
diff --git a/tests/untried/neg/t5318.scala b/tests/untried/neg-with-implicits/t5318.scala
similarity index 100%
rename from tests/untried/neg/t5318.scala
rename to tests/untried/neg-with-implicits/t5318.scala
diff --git a/tests/untried/neg/t5318b.scala b/tests/untried/neg-with-implicits/t5318b.scala
similarity index 100%
rename from tests/untried/neg/t5318b.scala
rename to tests/untried/neg-with-implicits/t5318b.scala
diff --git a/tests/untried/neg/t5318c.scala b/tests/untried/neg-with-implicits/t5318c.scala
similarity index 100%
rename from tests/untried/neg/t5318c.scala
rename to tests/untried/neg-with-implicits/t5318c.scala
diff --git a/tests/untried/neg/t5340.scala b/tests/untried/neg-with-implicits/t5340.scala
similarity index 100%
rename from tests/untried/neg/t5340.scala
rename to tests/untried/neg-with-implicits/t5340.scala
diff --git a/tests/untried/neg/t5354.scala b/tests/untried/neg-with-implicits/t5354.scala
similarity index 100%
rename from tests/untried/neg/t5354.scala
rename to tests/untried/neg-with-implicits/t5354.scala
diff --git a/tests/untried/neg/t5376.scala b/tests/untried/neg-with-implicits/t5376.scala
similarity index 100%
rename from tests/untried/neg/t5376.scala
rename to tests/untried/neg-with-implicits/t5376.scala
diff --git a/tests/untried/neg/t550.scala b/tests/untried/neg-with-implicits/t550.scala
similarity index 100%
rename from tests/untried/neg/t550.scala
rename to tests/untried/neg-with-implicits/t550.scala
diff --git a/tests/untried/neg/t5553_2.scala b/tests/untried/neg-with-implicits/t5553_2.scala
similarity index 100%
rename from tests/untried/neg/t5553_2.scala
rename to tests/untried/neg-with-implicits/t5553_2.scala
diff --git a/tests/untried/neg/t5554.scala b/tests/untried/neg-with-implicits/t5554.scala
similarity index 100%
rename from tests/untried/neg/t5554.scala
rename to tests/untried/neg-with-implicits/t5554.scala
diff --git a/tests/untried/neg/t5578.scala b/tests/untried/neg-with-implicits/t5578.scala
similarity index 100%
rename from tests/untried/neg/t5578.scala
rename to tests/untried/neg-with-implicits/t5578.scala
diff --git a/tests/untried/neg/t5728.scala b/tests/untried/neg-with-implicits/t5728.scala
similarity index 100%
rename from tests/untried/neg/t5728.scala
rename to tests/untried/neg-with-implicits/t5728.scala
diff --git a/tests/untried/neg/t5801.scala b/tests/untried/neg-with-implicits/t5801.scala
similarity index 100%
rename from tests/untried/neg/t5801.scala
rename to tests/untried/neg-with-implicits/t5801.scala
diff --git a/tests/untried/neg/t5803.scala b/tests/untried/neg-with-implicits/t5803.scala
similarity index 100%
rename from tests/untried/neg/t5803.scala
rename to tests/untried/neg-with-implicits/t5803.scala
diff --git a/tests/untried/neg/t5839.scala b/tests/untried/neg-with-implicits/t5839.scala
similarity index 100%
rename from tests/untried/neg/t5839.scala
rename to tests/untried/neg-with-implicits/t5839.scala
diff --git a/tests/untried/neg/t5892.scala b/tests/untried/neg-with-implicits/t5892.scala
similarity index 100%
rename from tests/untried/neg/t5892.scala
rename to tests/untried/neg-with-implicits/t5892.scala
diff --git a/tests/untried/neg/t5903a/Macros_1.scala b/tests/untried/neg-with-implicits/t5903a/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/t5903a/Macros_1.scala
rename to tests/untried/neg-with-implicits/t5903a/Macros_1.scala
diff --git a/tests/untried/neg/t5903a/Test_2.scala b/tests/untried/neg-with-implicits/t5903a/Test_2.scala
similarity index 100%
rename from tests/untried/neg/t5903a/Test_2.scala
rename to tests/untried/neg-with-implicits/t5903a/Test_2.scala
diff --git a/tests/untried/neg/t5903b/Macros_1.scala b/tests/untried/neg-with-implicits/t5903b/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/t5903b/Macros_1.scala
rename to tests/untried/neg-with-implicits/t5903b/Macros_1.scala
diff --git a/tests/untried/neg/t5903b/Test_2.scala b/tests/untried/neg-with-implicits/t5903b/Test_2.scala
similarity index 100%
rename from tests/untried/neg/t5903b/Test_2.scala
rename to tests/untried/neg-with-implicits/t5903b/Test_2.scala
diff --git a/tests/untried/neg/t5903c/Macros_1.scala b/tests/untried/neg-with-implicits/t5903c/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/t5903c/Macros_1.scala
rename to tests/untried/neg-with-implicits/t5903c/Macros_1.scala
diff --git a/tests/untried/neg/t5903c/Test_2.scala b/tests/untried/neg-with-implicits/t5903c/Test_2.scala
similarity index 100%
rename from tests/untried/neg/t5903c/Test_2.scala
rename to tests/untried/neg-with-implicits/t5903c/Test_2.scala
diff --git a/tests/untried/neg/t5903d/Macros_1.scala b/tests/untried/neg-with-implicits/t5903d/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/t5903d/Macros_1.scala
rename to tests/untried/neg-with-implicits/t5903d/Macros_1.scala
diff --git a/tests/untried/neg/t5903d/Test_2.scala b/tests/untried/neg-with-implicits/t5903d/Test_2.scala
similarity index 100%
rename from tests/untried/neg/t5903d/Test_2.scala
rename to tests/untried/neg-with-implicits/t5903d/Test_2.scala
diff --git a/tests/untried/neg/t5903e/Macros_1.scala b/tests/untried/neg-with-implicits/t5903e/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/t5903e/Macros_1.scala
rename to tests/untried/neg-with-implicits/t5903e/Macros_1.scala
diff --git a/tests/untried/neg/t5903e/Test_2.scala b/tests/untried/neg-with-implicits/t5903e/Test_2.scala
similarity index 100%
rename from tests/untried/neg/t5903e/Test_2.scala
rename to tests/untried/neg-with-implicits/t5903e/Test_2.scala
diff --git a/tests/untried/neg/t591.scala b/tests/untried/neg-with-implicits/t591.scala
similarity index 100%
rename from tests/untried/neg/t591.scala
rename to tests/untried/neg-with-implicits/t591.scala
diff --git a/tests/untried/neg/t6074.scala b/tests/untried/neg-with-implicits/t6074.scala
similarity index 100%
rename from tests/untried/neg/t6074.scala
rename to tests/untried/neg-with-implicits/t6074.scala
diff --git a/tests/untried/neg/t6083.scala b/tests/untried/neg-with-implicits/t6083.scala
similarity index 100%
rename from tests/untried/neg/t6083.scala
rename to tests/untried/neg-with-implicits/t6083.scala
diff --git a/tests/untried/neg/t6120.scala b/tests/untried/neg-with-implicits/t6120.scala
similarity index 100%
rename from tests/untried/neg/t6120.scala
rename to tests/untried/neg-with-implicits/t6120.scala
diff --git a/tests/untried/neg/t6227.scala b/tests/untried/neg-with-implicits/t6227.scala
similarity index 100%
rename from tests/untried/neg/t6227.scala
rename to tests/untried/neg-with-implicits/t6227.scala
diff --git a/tests/untried/neg/t6263.scala b/tests/untried/neg-with-implicits/t6263.scala
similarity index 100%
rename from tests/untried/neg/t6263.scala
rename to tests/untried/neg-with-implicits/t6263.scala
diff --git a/tests/untried/neg/t631.scala b/tests/untried/neg-with-implicits/t631.scala
similarity index 100%
rename from tests/untried/neg/t631.scala
rename to tests/untried/neg-with-implicits/t631.scala
diff --git a/tests/untried/neg/t6335.scala b/tests/untried/neg-with-implicits/t6335.scala
similarity index 100%
rename from tests/untried/neg/t6335.scala
rename to tests/untried/neg-with-implicits/t6335.scala
diff --git a/tests/untried/neg/t6436.scala b/tests/untried/neg-with-implicits/t6436.scala
similarity index 100%
rename from tests/untried/neg/t6436.scala
rename to tests/untried/neg-with-implicits/t6436.scala
diff --git a/tests/untried/neg/t6436b.scala b/tests/untried/neg-with-implicits/t6436b.scala
similarity index 100%
rename from tests/untried/neg/t6436b.scala
rename to tests/untried/neg-with-implicits/t6436b.scala
diff --git a/tests/untried/neg/t6567.scala b/tests/untried/neg-with-implicits/t6567.scala
similarity index 100%
rename from tests/untried/neg/t6567.scala
rename to tests/untried/neg-with-implicits/t6567.scala
diff --git a/tests/untried/neg/t6597.scala b/tests/untried/neg-with-implicits/t6597.scala
similarity index 100%
rename from tests/untried/neg/t6597.scala
rename to tests/untried/neg-with-implicits/t6597.scala
diff --git a/tests/untried/neg/t6666d.scala b/tests/untried/neg-with-implicits/t6666d.scala
similarity index 100%
rename from tests/untried/neg/t6666d.scala
rename to tests/untried/neg-with-implicits/t6666d.scala
diff --git a/tests/untried/neg/t6667.scala b/tests/untried/neg-with-implicits/t6667.scala
similarity index 100%
rename from tests/untried/neg/t6667.scala
rename to tests/untried/neg-with-implicits/t6667.scala
diff --git a/tests/untried/neg/t6667b.scala b/tests/untried/neg-with-implicits/t6667b.scala
similarity index 100%
rename from tests/untried/neg/t6667b.scala
rename to tests/untried/neg-with-implicits/t6667b.scala
diff --git a/tests/untried/neg/t6889.scala b/tests/untried/neg-with-implicits/t6889.scala
similarity index 100%
rename from tests/untried/neg/t6889.scala
rename to tests/untried/neg-with-implicits/t6889.scala
diff --git a/tests/untried/neg/t692.scala b/tests/untried/neg-with-implicits/t692.scala
similarity index 100%
rename from tests/untried/neg/t692.scala
rename to tests/untried/neg-with-implicits/t692.scala
diff --git a/tests/untried/neg/t6931/Macros_1.scala b/tests/untried/neg-with-implicits/t6931/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/t6931/Macros_1.scala
rename to tests/untried/neg-with-implicits/t6931/Macros_1.scala
diff --git a/tests/untried/neg/t6931/Test_2.scala b/tests/untried/neg-with-implicits/t6931/Test_2.scala
similarity index 100%
rename from tests/untried/neg/t6931/Test_2.scala
rename to tests/untried/neg-with-implicits/t6931/Test_2.scala
diff --git a/tests/untried/neg/t696.scala b/tests/untried/neg-with-implicits/t696.scala
similarity index 100%
rename from tests/untried/neg/t696.scala
rename to tests/untried/neg-with-implicits/t696.scala
diff --git a/tests/untried/neg/t712.scala b/tests/untried/neg-with-implicits/t712.scala
similarity index 100%
rename from tests/untried/neg/t712.scala
rename to tests/untried/neg-with-implicits/t712.scala
diff --git a/tests/untried/neg/t7289.scala b/tests/untried/neg-with-implicits/t7289.scala
similarity index 100%
rename from tests/untried/neg/t7289.scala
rename to tests/untried/neg-with-implicits/t7289.scala
diff --git a/tests/untried/neg/t7289_status_quo.scala b/tests/untried/neg-with-implicits/t7289_status_quo.scala
similarity index 100%
rename from tests/untried/neg/t7289_status_quo.scala
rename to tests/untried/neg-with-implicits/t7289_status_quo.scala
diff --git a/tests/untried/neg/t729.scala b/tests/untried/neg-with-implicits/t729.scala
similarity index 100%
rename from tests/untried/neg/t729.scala
rename to tests/untried/neg-with-implicits/t729.scala
diff --git a/tests/untried/neg/t7509.scala b/tests/untried/neg-with-implicits/t7509.scala
similarity index 100%
rename from tests/untried/neg/t7509.scala
rename to tests/untried/neg-with-implicits/t7509.scala
diff --git a/tests/untried/neg/t7519-b/Mac_1.scala b/tests/untried/neg-with-implicits/t7519-b/Mac_1.scala
similarity index 100%
rename from tests/untried/neg/t7519-b/Mac_1.scala
rename to tests/untried/neg-with-implicits/t7519-b/Mac_1.scala
diff --git a/tests/untried/neg/t7519-b/Use_2.scala b/tests/untried/neg-with-implicits/t7519-b/Use_2.scala
similarity index 100%
rename from tests/untried/neg/t7519-b/Use_2.scala
rename to tests/untried/neg-with-implicits/t7519-b/Use_2.scala
diff --git a/tests/untried/neg/t7519.scala b/tests/untried/neg-with-implicits/t7519.scala
similarity index 100%
rename from tests/untried/neg/t7519.scala
rename to tests/untried/neg-with-implicits/t7519.scala
diff --git a/tests/untried/neg/t7721.scala b/tests/untried/neg-with-implicits/t7721.scala
similarity index 100%
rename from tests/untried/neg/t7721.scala
rename to tests/untried/neg-with-implicits/t7721.scala
diff --git a/tests/untried/neg/t8024.scala b/tests/untried/neg-with-implicits/t8024.scala
similarity index 100%
rename from tests/untried/neg/t8024.scala
rename to tests/untried/neg-with-implicits/t8024.scala
diff --git a/tests/untried/neg/t8024b.scala b/tests/untried/neg-with-implicits/t8024b.scala
similarity index 100%
rename from tests/untried/neg/t8024b.scala
rename to tests/untried/neg-with-implicits/t8024b.scala
diff --git a/tests/untried/neg/t8104/Macros_1.scala b/tests/untried/neg-with-implicits/t8104/Macros_1.scala
similarity index 100%
rename from tests/untried/neg/t8104/Macros_1.scala
rename to tests/untried/neg-with-implicits/t8104/Macros_1.scala
diff --git a/tests/untried/neg/t8104/Test_2.scala b/tests/untried/neg-with-implicits/t8104/Test_2.scala
similarity index 100%
rename from tests/untried/neg/t8104/Test_2.scala
rename to tests/untried/neg-with-implicits/t8104/Test_2.scala
diff --git a/tests/untried/neg/t8372.scala b/tests/untried/neg-with-implicits/t8372.scala
similarity index 100%
rename from tests/untried/neg/t8372.scala
rename to tests/untried/neg-with-implicits/t8372.scala
diff --git a/tests/untried/neg/viewtest.scala b/tests/untried/neg-with-implicits/viewtest.scala
similarity index 100%
rename from tests/untried/neg/viewtest.scala
rename to tests/untried/neg-with-implicits/viewtest.scala
diff --git a/tests/untried/neg/warn-unused-imports.scala b/tests/untried/neg-with-implicits/warn-unused-imports.scala
similarity index 100%
rename from tests/untried/neg/warn-unused-imports.scala
rename to tests/untried/neg-with-implicits/warn-unused-imports.scala