diff options
-rw-r--r-- | test/scaladoc/resources/implicits-base-res.scala | 2 | ||||
-rw-r--r-- | test/scaladoc/resources/implicits-chaining-res.scala | 2 | ||||
-rw-r--r-- | test/scaladoc/resources/implicits-elimination-res.scala | 7 | ||||
-rw-r--r-- | test/scaladoc/resources/implicits-scopes-res.scala | 1 | ||||
-rw-r--r-- | test/scaladoc/run/implicits-base.check (renamed from test/disabled/run/implicits-base.check) | 0 | ||||
-rw-r--r-- | test/scaladoc/run/implicits-base.scala (renamed from test/disabled/run/implicits-base.scala) | 0 | ||||
-rw-r--r-- | test/scaladoc/run/implicits-chaining.check (renamed from test/disabled/run/implicits-chaining.check) | 0 | ||||
-rw-r--r-- | test/scaladoc/run/implicits-chaining.scala (renamed from test/disabled/run/implicits-chaining.scala) | 0 | ||||
-rw-r--r-- | test/scaladoc/run/implicits-elimination.check (renamed from test/disabled/run/implicits-elimination.check) | 0 | ||||
-rw-r--r-- | test/scaladoc/run/implicits-elimination.scala (renamed from test/disabled/run/implicits-elimination.scala) | 0 | ||||
-rw-r--r-- | test/scaladoc/run/implicits-scopes.check (renamed from test/disabled/run/implicits-scopes.check) | 0 | ||||
-rw-r--r-- | test/scaladoc/run/implicits-scopes.scala (renamed from test/disabled/run/implicits-scopes.scala) | 0 |
12 files changed, 11 insertions, 1 deletions
diff --git a/test/scaladoc/resources/implicits-base-res.scala b/test/scaladoc/resources/implicits-base-res.scala index db7ca4fa51..ce86ba8918 100644 --- a/test/scaladoc/resources/implicits-base-res.scala +++ b/test/scaladoc/resources/implicits-base-res.scala @@ -28,6 +28,8 @@ class A[T] { } /** Companion object with implicit transformations */ object A { + import language.implicitConversions // according to SIP18 + implicit def pimpA0[V](a: A[V]) = new PimpedA(a) implicit def pimpA1[ZBUR: Numeric](a: A[ZBUR]) = new NumericA[ZBUR](a) implicit def pimpA2(a: A[Int]) = new IntA(a) diff --git a/test/scaladoc/resources/implicits-chaining-res.scala b/test/scaladoc/resources/implicits-chaining-res.scala index b20c8f846c..c005d5fe09 100644 --- a/test/scaladoc/resources/implicits-chaining-res.scala +++ b/test/scaladoc/resources/implicits-chaining-res.scala @@ -3,6 +3,8 @@ */ package scala.test.scaladoc.implicits { + import language.implicitConversions // according to SIP18 + // the classes involved case class Z[U](a: U) case class Intermediate[T, U](t: T, u: U) diff --git a/test/scaladoc/resources/implicits-elimination-res.scala b/test/scaladoc/resources/implicits-elimination-res.scala index 68743aee06..b23667440c 100644 --- a/test/scaladoc/resources/implicits-elimination-res.scala +++ b/test/scaladoc/resources/implicits-elimination-res.scala @@ -2,8 +2,13 @@ * Testing scaladoc implicits elimination */ package scala.test.scaladoc.implicits.elimination { + + import language.implicitConversions // according to SIP18 + /** No conversion, as B doesn't bring any member */ class A class B { class C; trait V; type T; } - object A { implicit def toB(a: A): B = null } + object A { + implicit def toB(a: A): B = null + } } diff --git a/test/scaladoc/resources/implicits-scopes-res.scala b/test/scaladoc/resources/implicits-scopes-res.scala index 4e55c3e388..aaeb43f95b 100644 --- a/test/scaladoc/resources/implicits-scopes-res.scala +++ b/test/scaladoc/resources/implicits-scopes-res.scala @@ -2,6 +2,7 @@ * Testing scaladoc implicit scopes - looking for implicits in the right places */ package scala.test.scaladoc.implicits.scopes +import language.implicitConversions // according to SIP18 // TEST1 - In package object package object test1 { diff --git a/test/disabled/run/implicits-base.check b/test/scaladoc/run/implicits-base.check index 619c56180b..619c56180b 100644 --- a/test/disabled/run/implicits-base.check +++ b/test/scaladoc/run/implicits-base.check diff --git a/test/disabled/run/implicits-base.scala b/test/scaladoc/run/implicits-base.scala index 06d017ed70..06d017ed70 100644 --- a/test/disabled/run/implicits-base.scala +++ b/test/scaladoc/run/implicits-base.scala diff --git a/test/disabled/run/implicits-chaining.check b/test/scaladoc/run/implicits-chaining.check index 619c56180b..619c56180b 100644 --- a/test/disabled/run/implicits-chaining.check +++ b/test/scaladoc/run/implicits-chaining.check diff --git a/test/disabled/run/implicits-chaining.scala b/test/scaladoc/run/implicits-chaining.scala index 858ca9ce61..858ca9ce61 100644 --- a/test/disabled/run/implicits-chaining.scala +++ b/test/scaladoc/run/implicits-chaining.scala diff --git a/test/disabled/run/implicits-elimination.check b/test/scaladoc/run/implicits-elimination.check index 619c56180b..619c56180b 100644 --- a/test/disabled/run/implicits-elimination.check +++ b/test/scaladoc/run/implicits-elimination.check diff --git a/test/disabled/run/implicits-elimination.scala b/test/scaladoc/run/implicits-elimination.scala index ed37b9cd90..ed37b9cd90 100644 --- a/test/disabled/run/implicits-elimination.scala +++ b/test/scaladoc/run/implicits-elimination.scala diff --git a/test/disabled/run/implicits-scopes.check b/test/scaladoc/run/implicits-scopes.check index 619c56180b..619c56180b 100644 --- a/test/disabled/run/implicits-scopes.check +++ b/test/scaladoc/run/implicits-scopes.check diff --git a/test/disabled/run/implicits-scopes.scala b/test/scaladoc/run/implicits-scopes.scala index 7b9e80e148..7b9e80e148 100644 --- a/test/disabled/run/implicits-scopes.scala +++ b/test/scaladoc/run/implicits-scopes.scala |