diff options
author | Paul Phillips <paulp@improving.org> | 2012-04-14 05:03:26 +0100 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-04-14 05:03:26 +0100 |
commit | 3a2901da406f2478b5634b0636e56de9c4cd676d (patch) | |
tree | 352ad9227f4616b0abf9b6fca76a123da8a42bd8 | |
parent | 7bd3b62ea5fc425fcf24685b6b8d8c5d1da0b8f5 (diff) | |
parent | e638405d4c89c22f9fd72bc63806c7ff57c30e41 (diff) | |
download | scala-3a2901da406f2478b5634b0636e56de9c4cd676d.tar.gz scala-3a2901da406f2478b5634b0636e56de9c4cd676d.tar.bz2 scala-3a2901da406f2478b5634b0636e56de9c4cd676d.zip |
Merge commit 'refs/pull/395/head'
-rw-r--r-- | test/disabled/run/implicits-base.check (renamed from test/scaladoc/run/implicits-base.check) | 0 | ||||
-rw-r--r-- | test/disabled/run/implicits-base.scala (renamed from test/scaladoc/run/implicits-base.scala) | 3 | ||||
-rw-r--r-- | test/disabled/run/implicits-chaining.check (renamed from test/scaladoc/run/implicits-chaining.check) | 0 | ||||
-rw-r--r-- | test/disabled/run/implicits-chaining.scala (renamed from test/scaladoc/run/implicits-chaining.scala) | 3 | ||||
-rw-r--r-- | test/disabled/run/implicits-elimination.check (renamed from test/scaladoc/run/implicits-elimination.check) | 0 | ||||
-rw-r--r-- | test/disabled/run/implicits-elimination.scala (renamed from test/scaladoc/run/implicits-elimination.scala) | 3 | ||||
-rw-r--r-- | test/disabled/run/implicits-scopes.check (renamed from test/scaladoc/run/implicits-scopes.check) | 0 | ||||
-rw-r--r-- | test/disabled/run/implicits-scopes.scala (renamed from test/scaladoc/run/implicits-scopes.scala) | 3 |
8 files changed, 8 insertions, 4 deletions
diff --git a/test/scaladoc/run/implicits-base.check b/test/disabled/run/implicits-base.check index 619c56180b..619c56180b 100644 --- a/test/scaladoc/run/implicits-base.check +++ b/test/disabled/run/implicits-base.check diff --git a/test/scaladoc/run/implicits-base.scala b/test/disabled/run/implicits-base.scala index a0dd2071d7..06d017ed70 100644 --- a/test/scaladoc/run/implicits-base.scala +++ b/test/disabled/run/implicits-base.scala @@ -1,5 +1,6 @@ import scala.tools.nsc.doc.model._ import scala.tools.partest.ScaladocModelTest +import language._ object Test extends ScaladocModelTest { @@ -176,4 +177,4 @@ object Test extends ScaladocModelTest { assert(conv.constraints.length == 1) assert(conv._member("convToMyNumericA").resultType.name == "String") } -}
\ No newline at end of file +} diff --git a/test/scaladoc/run/implicits-chaining.check b/test/disabled/run/implicits-chaining.check index 619c56180b..619c56180b 100644 --- a/test/scaladoc/run/implicits-chaining.check +++ b/test/disabled/run/implicits-chaining.check diff --git a/test/scaladoc/run/implicits-chaining.scala b/test/disabled/run/implicits-chaining.scala index 96e288b204..858ca9ce61 100644 --- a/test/scaladoc/run/implicits-chaining.scala +++ b/test/disabled/run/implicits-chaining.scala @@ -1,5 +1,6 @@ import scala.tools.nsc.doc.model._ import scala.tools.partest.ScaladocModelTest +import language._ object Test extends ScaladocModelTest { @@ -61,4 +62,4 @@ object Test extends ScaladocModelTest { assert(F._conversions(base.qualifiedName + ".convertToZ").isEmpty) } -}
\ No newline at end of file +} diff --git a/test/scaladoc/run/implicits-elimination.check b/test/disabled/run/implicits-elimination.check index 619c56180b..619c56180b 100644 --- a/test/scaladoc/run/implicits-elimination.check +++ b/test/disabled/run/implicits-elimination.check diff --git a/test/scaladoc/run/implicits-elimination.scala b/test/disabled/run/implicits-elimination.scala index 71319f9f47..ed37b9cd90 100644 --- a/test/scaladoc/run/implicits-elimination.scala +++ b/test/disabled/run/implicits-elimination.scala @@ -1,5 +1,6 @@ import scala.tools.nsc.doc.model._ import scala.tools.partest.ScaladocModelTest +import language._ object Test extends ScaladocModelTest { @@ -19,4 +20,4 @@ object Test extends ScaladocModelTest { assert(A._conversions(A.qualifiedName + ".toB").isEmpty) } -}
\ No newline at end of file +} diff --git a/test/scaladoc/run/implicits-scopes.check b/test/disabled/run/implicits-scopes.check index 619c56180b..619c56180b 100644 --- a/test/scaladoc/run/implicits-scopes.check +++ b/test/disabled/run/implicits-scopes.check diff --git a/test/scaladoc/run/implicits-scopes.scala b/test/disabled/run/implicits-scopes.scala index 7fb41e1ae8..7b9e80e148 100644 --- a/test/scaladoc/run/implicits-scopes.scala +++ b/test/disabled/run/implicits-scopes.scala @@ -1,5 +1,6 @@ import scala.tools.nsc.doc.model._ import scala.tools.partest.ScaladocModelTest +import language._ object Test extends ScaladocModelTest { @@ -73,4 +74,4 @@ object Test extends ScaladocModelTest { assert(conv.constraints.length == 0) } } -}
\ No newline at end of file +} |