diff options
-rw-r--r-- | tests/untried/neg-with-implicits/classmanifests_new_deprecations.scala (renamed from tests/untried/neg/classmanifests_new_deprecations.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/compile-time-only-a.scala (renamed from tests/untried/neg/compile-time-only-a.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/divergent-implicit.scala (renamed from tests/untried/neg/divergent-implicit.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/forgot-interpolator.scala (renamed from tests/untried/neg/forgot-interpolator.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/implicit-shadow.scala (renamed from tests/untried/neg/implicit-shadow.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/implicits.scala (renamed from tests/untried/neg/implicits.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/logImplicits.scala (renamed from tests/untried/neg/logImplicits.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-blackbox-dynamic-materialization/Macros_1.scala (renamed from tests/untried/neg/macro-blackbox-dynamic-materialization/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-blackbox-dynamic-materialization/Test_2.scala (renamed from tests/untried/neg/macro-blackbox-dynamic-materialization/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-blackbox-fundep-materialization/Macros_1.scala (renamed from tests/untried/neg/macro-blackbox-fundep-materialization/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-blackbox-fundep-materialization/Test_2.scala (renamed from tests/untried/neg/macro-blackbox-fundep-materialization/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-bundle-whitebox-use-raw/Macros_1.scala (renamed from tests/untried/neg/macro-bundle-whitebox-use-raw/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-bundle-whitebox-use-raw/Test_2.scala (renamed from tests/untried/neg/macro-bundle-whitebox-use-raw/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-bundle-whitebox-use-refined/Macros_1.scala (renamed from tests/untried/neg/macro-bundle-whitebox-use-refined/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-bundle-whitebox-use-refined/Test_2.scala (renamed from tests/untried/neg/macro-bundle-whitebox-use-refined/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-cyclic/Impls_Macros_1.scala (renamed from tests/untried/neg/macro-cyclic/Impls_Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-divergence-controlled/Impls_Macros_1.scala (renamed from tests/untried/neg/macro-divergence-controlled/Impls_Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-divergence-controlled/Test_2.scala (renamed from tests/untried/neg/macro-divergence-controlled/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-invalidsig/Impls_1.scala (renamed from tests/untried/neg/macro-invalidsig/Impls_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/macro-invalidsig/Macros_Test_2.scala (renamed from tests/untried/neg/macro-invalidsig/Macros_Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/overloaded-implicit.scala (renamed from tests/untried/neg/overloaded-implicit.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/patmat-classtag-compound.scala (renamed from tests/untried/neg/patmat-classtag-compound.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/sammy_restrictions.scala (renamed from tests/untried/neg/sammy_restrictions.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/sensitive2.scala (renamed from tests/untried/neg/sensitive2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/stringinterpolation_macro-neg.scala (renamed from tests/untried/neg/stringinterpolation_macro-neg.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t0226.scala (renamed from tests/untried/neg/t0226.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t0590.scala (renamed from tests/untried/neg/t0590.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t1038.scala (renamed from tests/untried/neg/t1038.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t2206.scala (renamed from tests/untried/neg/t2206.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t2316.scala (renamed from tests/untried/neg/t2316.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t2405.scala (renamed from tests/untried/neg/t2405.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t2421b.scala (renamed from tests/untried/neg/t2421b.scala) | 0 | ||||
-rwxr-xr-x | tests/untried/neg-with-implicits/t3006.scala (renamed from tests/untried/neg/t3006.scala) | 0 | ||||
-rwxr-xr-x | tests/untried/neg-with-implicits/t3224.scala (renamed from tests/untried/neg/t3224.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3346b.scala (renamed from tests/untried/neg/t3346b.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3346c.scala (renamed from tests/untried/neg/t3346c.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3346i.scala (renamed from tests/untried/neg/t3346i.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3453.scala (renamed from tests/untried/neg/t3453.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3653.scala (renamed from tests/untried/neg/t3653.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3692-new.scala (renamed from tests/untried/neg/t3692-new.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3776.scala (renamed from tests/untried/neg/t3776.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3854.scala (renamed from tests/untried/neg/t3854.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3977.scala (renamed from tests/untried/neg/t3977.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t3995.scala (renamed from tests/untried/neg/t3995.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t4079/t4079_1.scala (renamed from tests/untried/neg/t4079/t4079_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t4079/t4079_2.scala (renamed from tests/untried/neg/t4079/t4079_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t4270.scala (renamed from tests/untried/neg/t4270.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t4271.scala (renamed from tests/untried/neg/t4271.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t4457_1.scala (renamed from tests/untried/neg/t4457_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t4457_2.scala (renamed from tests/untried/neg/t4457_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t4568.scala (renamed from tests/untried/neg/t4568.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t4882.scala (renamed from tests/untried/neg/t4882.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5318.scala (renamed from tests/untried/neg/t5318.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5318b.scala (renamed from tests/untried/neg/t5318b.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5318c.scala (renamed from tests/untried/neg/t5318c.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5340.scala (renamed from tests/untried/neg/t5340.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5354.scala (renamed from tests/untried/neg/t5354.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5376.scala (renamed from tests/untried/neg/t5376.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t550.scala (renamed from tests/untried/neg/t550.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5553_2.scala (renamed from tests/untried/neg/t5553_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5554.scala (renamed from tests/untried/neg/t5554.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5578.scala (renamed from tests/untried/neg/t5578.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5728.scala (renamed from tests/untried/neg/t5728.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5801.scala (renamed from tests/untried/neg/t5801.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5803.scala (renamed from tests/untried/neg/t5803.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5839.scala (renamed from tests/untried/neg/t5839.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5892.scala (renamed from tests/untried/neg/t5892.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903a/Macros_1.scala (renamed from tests/untried/neg/t5903a/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903a/Test_2.scala (renamed from tests/untried/neg/t5903a/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903b/Macros_1.scala (renamed from tests/untried/neg/t5903b/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903b/Test_2.scala (renamed from tests/untried/neg/t5903b/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903c/Macros_1.scala (renamed from tests/untried/neg/t5903c/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903c/Test_2.scala (renamed from tests/untried/neg/t5903c/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903d/Macros_1.scala (renamed from tests/untried/neg/t5903d/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903d/Test_2.scala (renamed from tests/untried/neg/t5903d/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903e/Macros_1.scala (renamed from tests/untried/neg/t5903e/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t5903e/Test_2.scala (renamed from tests/untried/neg/t5903e/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t591.scala (renamed from tests/untried/neg/t591.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6074.scala (renamed from tests/untried/neg/t6074.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6083.scala (renamed from tests/untried/neg/t6083.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6120.scala (renamed from tests/untried/neg/t6120.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6227.scala (renamed from tests/untried/neg/t6227.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6263.scala (renamed from tests/untried/neg/t6263.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t631.scala (renamed from tests/untried/neg/t631.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6335.scala (renamed from tests/untried/neg/t6335.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6436.scala (renamed from tests/untried/neg/t6436.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6436b.scala (renamed from tests/untried/neg/t6436b.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6567.scala (renamed from tests/untried/neg/t6567.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6597.scala (renamed from tests/untried/neg/t6597.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6666d.scala (renamed from tests/untried/neg/t6666d.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6667.scala (renamed from tests/untried/neg/t6667.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6667b.scala (renamed from tests/untried/neg/t6667b.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6889.scala (renamed from tests/untried/neg/t6889.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t692.scala (renamed from tests/untried/neg/t692.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6931/Macros_1.scala (renamed from tests/untried/neg/t6931/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t6931/Test_2.scala (renamed from tests/untried/neg/t6931/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t696.scala (renamed from tests/untried/neg/t696.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t712.scala (renamed from tests/untried/neg/t712.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t7289.scala (renamed from tests/untried/neg/t7289.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t7289_status_quo.scala (renamed from tests/untried/neg/t7289_status_quo.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t729.scala (renamed from tests/untried/neg/t729.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t7509.scala (renamed from tests/untried/neg/t7509.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t7519-b/Mac_1.scala (renamed from tests/untried/neg/t7519-b/Mac_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t7519-b/Use_2.scala (renamed from tests/untried/neg/t7519-b/Use_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t7519.scala (renamed from tests/untried/neg/t7519.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t7721.scala (renamed from tests/untried/neg/t7721.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t8024.scala (renamed from tests/untried/neg/t8024.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t8024b.scala (renamed from tests/untried/neg/t8024b.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t8104/Macros_1.scala (renamed from tests/untried/neg/t8104/Macros_1.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t8104/Test_2.scala (renamed from tests/untried/neg/t8104/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/t8372.scala (renamed from tests/untried/neg/t8372.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/viewtest.scala (renamed from tests/untried/neg/viewtest.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg-with-implicits/warn-unused-imports.scala (renamed from tests/untried/neg/warn-unused-imports.scala) | 0 | ||||
-rw-r--r-- | tests/untried/neg/t5543.scala | 8 | ||||
-rw-r--r-- | tests/untried/neg/t6666.scala | 2 | ||||
-rw-r--r-- | tests/untried/neg/t7605-deprecation.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/SI-7638.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/depmet_implicit_chaining_zw.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/depmet_implicit_norm_ret.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/depmet_implicit_oopsla_session.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/depmet_implicit_oopsla_session_2.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/depmet_implicit_oopsla_zipwith.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/implicits-new.scala | 8 | ||||
-rw-r--r-- | tests/untried/pos/implicits-old.scala | 8 | ||||
-rw-r--r-- | tests/untried/pos/presuperContext.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t0438.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t0591.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t0786.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/t0851.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t0872.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t1147.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t1832.scala | 2 | ||||
-rwxr-xr-x | tests/untried/pos/t2060.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t2421_delitedsl.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t2421b_pos.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t2421c.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/t2782.scala | 4 | ||||
-rwxr-xr-x | tests/untried/pos/t2913.scala | 6 | ||||
-rw-r--r-- | tests/untried/pos/t3177.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t3373.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t3808.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t3999/a_1.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/t4273.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/t4457_1.scala | 8 | ||||
-rw-r--r-- | tests/untried/pos/t4975.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t5156.scala | 6 | ||||
-rw-r--r-- | tests/untried/pos/t5892.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t6201.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/t628.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t6556.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t7180.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t7486-named.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t7486.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/t8219b.scala | 4 | ||||
-rw-r--r-- | tests/untried/pos/tcpoly_infer_ticket1864.scala | 2 | ||||
-rw-r--r-- | tests/untried/pos/ticket2201.scala | 2 |
156 files changed, 71 insertions, 71 deletions
diff --git a/tests/untried/neg/classmanifests_new_deprecations.scala b/tests/untried/neg-with-implicits/classmanifests_new_deprecations.scala index 7aebf011f..7aebf011f 100644 --- a/tests/untried/neg/classmanifests_new_deprecations.scala +++ b/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 index 130a3c539..130a3c539 100644 --- a/tests/untried/neg/compile-time-only-a.scala +++ b/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 index 4a356d54f..4a356d54f 100644 --- a/tests/untried/neg/divergent-implicit.scala +++ b/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 index a53054d89..a53054d89 100644 --- a/tests/untried/neg/forgot-interpolator.scala +++ b/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 index ec7f70b6d..ec7f70b6d 100644 --- a/tests/untried/neg/implicit-shadow.scala +++ b/tests/untried/neg-with-implicits/implicit-shadow.scala diff --git a/tests/untried/neg/implicits.scala b/tests/untried/neg-with-implicits/implicits.scala index 22633a1f3..22633a1f3 100644 --- a/tests/untried/neg/implicits.scala +++ b/tests/untried/neg-with-implicits/implicits.scala diff --git a/tests/untried/neg/logImplicits.scala b/tests/untried/neg-with-implicits/logImplicits.scala index ecb4cbb31..ecb4cbb31 100644 --- a/tests/untried/neg/logImplicits.scala +++ b/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 index 16a379ea5..16a379ea5 100644 --- a/tests/untried/neg/macro-blackbox-dynamic-materialization/Macros_1.scala +++ b/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 index abb5229bd..abb5229bd 100644 --- a/tests/untried/neg/macro-blackbox-dynamic-materialization/Test_2.scala +++ b/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 index 8d776388e..8d776388e 100644 --- a/tests/untried/neg/macro-blackbox-fundep-materialization/Macros_1.scala +++ b/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 index 8b60943cf..8b60943cf 100644 --- a/tests/untried/neg/macro-blackbox-fundep-materialization/Test_2.scala +++ b/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 index 61bf73e48..61bf73e48 100644 --- 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 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 index 995da737c..995da737c 100644 --- 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 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 index 186604422..186604422 100644 --- 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 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 index 995da737c..995da737c 100644 --- 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 diff --git a/tests/untried/neg/macro-cyclic/Impls_Macros_1.scala b/tests/untried/neg-with-implicits/macro-cyclic/Impls_Macros_1.scala index ad6890144..ad6890144 100644 --- a/tests/untried/neg/macro-cyclic/Impls_Macros_1.scala +++ b/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 index 5c0450326..5c0450326 100644 --- a/tests/untried/neg/macro-divergence-controlled/Impls_Macros_1.scala +++ b/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 index e06175f30..e06175f30 100644 --- a/tests/untried/neg/macro-divergence-controlled/Test_2.scala +++ b/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 index 2816c4ddf..2816c4ddf 100644 --- a/tests/untried/neg/macro-invalidsig/Impls_1.scala +++ b/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 index d662a029e..d662a029e 100644 --- a/tests/untried/neg/macro-invalidsig/Macros_Test_2.scala +++ b/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 index 68b1ceaa3..68b1ceaa3 100644 --- a/tests/untried/neg/overloaded-implicit.scala +++ b/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 index e2d0df0a0..e2d0df0a0 100644 --- a/tests/untried/neg/patmat-classtag-compound.scala +++ b/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 index 5f1a04cd2..5f1a04cd2 100644 --- a/tests/untried/neg/sammy_restrictions.scala +++ b/tests/untried/neg-with-implicits/sammy_restrictions.scala diff --git a/tests/untried/neg/sensitive2.scala b/tests/untried/neg-with-implicits/sensitive2.scala index e0cf515bd..e0cf515bd 100644 --- a/tests/untried/neg/sensitive2.scala +++ b/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 index 3869d42d6..3869d42d6 100644 --- a/tests/untried/neg/stringinterpolation_macro-neg.scala +++ b/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 index beca3cd64..beca3cd64 100644 --- a/tests/untried/neg/t0226.scala +++ b/tests/untried/neg-with-implicits/t0226.scala diff --git a/tests/untried/neg/t0590.scala b/tests/untried/neg-with-implicits/t0590.scala index 3416ade35..3416ade35 100644 --- a/tests/untried/neg/t0590.scala +++ b/tests/untried/neg-with-implicits/t0590.scala diff --git a/tests/untried/neg/t1038.scala b/tests/untried/neg-with-implicits/t1038.scala index 367022965..367022965 100644 --- a/tests/untried/neg/t1038.scala +++ b/tests/untried/neg-with-implicits/t1038.scala diff --git a/tests/untried/neg/t2206.scala b/tests/untried/neg-with-implicits/t2206.scala index 529f5030b..529f5030b 100644 --- a/tests/untried/neg/t2206.scala +++ b/tests/untried/neg-with-implicits/t2206.scala diff --git a/tests/untried/neg/t2316.scala b/tests/untried/neg-with-implicits/t2316.scala index bf4bb0ec6..bf4bb0ec6 100644 --- a/tests/untried/neg/t2316.scala +++ b/tests/untried/neg-with-implicits/t2316.scala diff --git a/tests/untried/neg/t2405.scala b/tests/untried/neg-with-implicits/t2405.scala index 6982285b9..6982285b9 100644 --- a/tests/untried/neg/t2405.scala +++ b/tests/untried/neg-with-implicits/t2405.scala diff --git a/tests/untried/neg/t2421b.scala b/tests/untried/neg-with-implicits/t2421b.scala index 4e23a74e8..4e23a74e8 100644 --- a/tests/untried/neg/t2421b.scala +++ b/tests/untried/neg-with-implicits/t2421b.scala diff --git a/tests/untried/neg/t3006.scala b/tests/untried/neg-with-implicits/t3006.scala index a84b69c84..a84b69c84 100755 --- a/tests/untried/neg/t3006.scala +++ b/tests/untried/neg-with-implicits/t3006.scala diff --git a/tests/untried/neg/t3224.scala b/tests/untried/neg-with-implicits/t3224.scala index b7af8a67b..b7af8a67b 100755 --- a/tests/untried/neg/t3224.scala +++ b/tests/untried/neg-with-implicits/t3224.scala diff --git a/tests/untried/neg/t3346b.scala b/tests/untried/neg-with-implicits/t3346b.scala index f28ee8ba3..f28ee8ba3 100644 --- a/tests/untried/neg/t3346b.scala +++ b/tests/untried/neg-with-implicits/t3346b.scala diff --git a/tests/untried/neg/t3346c.scala b/tests/untried/neg-with-implicits/t3346c.scala index a5ac166b2..a5ac166b2 100644 --- a/tests/untried/neg/t3346c.scala +++ b/tests/untried/neg-with-implicits/t3346c.scala diff --git a/tests/untried/neg/t3346i.scala b/tests/untried/neg-with-implicits/t3346i.scala index 9ad254453..9ad254453 100644 --- a/tests/untried/neg/t3346i.scala +++ b/tests/untried/neg-with-implicits/t3346i.scala diff --git a/tests/untried/neg/t3453.scala b/tests/untried/neg-with-implicits/t3453.scala index af7781894..af7781894 100644 --- a/tests/untried/neg/t3453.scala +++ b/tests/untried/neg-with-implicits/t3453.scala diff --git a/tests/untried/neg/t3653.scala b/tests/untried/neg-with-implicits/t3653.scala index 0bedc4fdc..0bedc4fdc 100644 --- a/tests/untried/neg/t3653.scala +++ b/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 index 6ecf4acb8..6ecf4acb8 100644 --- a/tests/untried/neg/t3692-new.scala +++ b/tests/untried/neg-with-implicits/t3692-new.scala diff --git a/tests/untried/neg/t3776.scala b/tests/untried/neg-with-implicits/t3776.scala index e24b2fea6..e24b2fea6 100644 --- a/tests/untried/neg/t3776.scala +++ b/tests/untried/neg-with-implicits/t3776.scala diff --git a/tests/untried/neg/t3854.scala b/tests/untried/neg-with-implicits/t3854.scala index e8db76c0a..e8db76c0a 100644 --- a/tests/untried/neg/t3854.scala +++ b/tests/untried/neg-with-implicits/t3854.scala diff --git a/tests/untried/neg/t3977.scala b/tests/untried/neg-with-implicits/t3977.scala index 11a8cdba4..11a8cdba4 100644 --- a/tests/untried/neg/t3977.scala +++ b/tests/untried/neg-with-implicits/t3977.scala diff --git a/tests/untried/neg/t3995.scala b/tests/untried/neg-with-implicits/t3995.scala index be169639d..be169639d 100644 --- a/tests/untried/neg/t3995.scala +++ b/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 index cbae86478..cbae86478 100644 --- a/tests/untried/neg/t4079/t4079_1.scala +++ b/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 index 9069f0ab4..9069f0ab4 100644 --- a/tests/untried/neg/t4079/t4079_2.scala +++ b/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 index 2c7c71d8c..2c7c71d8c 100644 --- a/tests/untried/neg/t4270.scala +++ b/tests/untried/neg-with-implicits/t4270.scala diff --git a/tests/untried/neg/t4271.scala b/tests/untried/neg-with-implicits/t4271.scala index 46ae3ad9e..46ae3ad9e 100644 --- a/tests/untried/neg/t4271.scala +++ b/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 index 11dae1097..11dae1097 100644 --- a/tests/untried/neg/t4457_1.scala +++ b/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 index f2664cc14..f2664cc14 100644 --- a/tests/untried/neg/t4457_2.scala +++ b/tests/untried/neg-with-implicits/t4457_2.scala diff --git a/tests/untried/neg/t4568.scala b/tests/untried/neg-with-implicits/t4568.scala index 6fda28736..6fda28736 100644 --- a/tests/untried/neg/t4568.scala +++ b/tests/untried/neg-with-implicits/t4568.scala diff --git a/tests/untried/neg/t4882.scala b/tests/untried/neg-with-implicits/t4882.scala index 4e58ef787..4e58ef787 100644 --- a/tests/untried/neg/t4882.scala +++ b/tests/untried/neg-with-implicits/t4882.scala diff --git a/tests/untried/neg/t5318.scala b/tests/untried/neg-with-implicits/t5318.scala index 5be82a02a..5be82a02a 100644 --- a/tests/untried/neg/t5318.scala +++ b/tests/untried/neg-with-implicits/t5318.scala diff --git a/tests/untried/neg/t5318b.scala b/tests/untried/neg-with-implicits/t5318b.scala index a2d55b1e4..a2d55b1e4 100644 --- a/tests/untried/neg/t5318b.scala +++ b/tests/untried/neg-with-implicits/t5318b.scala diff --git a/tests/untried/neg/t5318c.scala b/tests/untried/neg-with-implicits/t5318c.scala index 477a9874a..477a9874a 100644 --- a/tests/untried/neg/t5318c.scala +++ b/tests/untried/neg-with-implicits/t5318c.scala diff --git a/tests/untried/neg/t5340.scala b/tests/untried/neg-with-implicits/t5340.scala index b283f1333..b283f1333 100644 --- a/tests/untried/neg/t5340.scala +++ b/tests/untried/neg-with-implicits/t5340.scala diff --git a/tests/untried/neg/t5354.scala b/tests/untried/neg-with-implicits/t5354.scala index 99b565015..99b565015 100644 --- a/tests/untried/neg/t5354.scala +++ b/tests/untried/neg-with-implicits/t5354.scala diff --git a/tests/untried/neg/t5376.scala b/tests/untried/neg-with-implicits/t5376.scala index 9dcaccbf1..9dcaccbf1 100644 --- a/tests/untried/neg/t5376.scala +++ b/tests/untried/neg-with-implicits/t5376.scala diff --git a/tests/untried/neg/t550.scala b/tests/untried/neg-with-implicits/t550.scala index 5212a2658..5212a2658 100644 --- a/tests/untried/neg/t550.scala +++ b/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 index 16958aec8..16958aec8 100644 --- a/tests/untried/neg/t5553_2.scala +++ b/tests/untried/neg-with-implicits/t5553_2.scala diff --git a/tests/untried/neg/t5554.scala b/tests/untried/neg-with-implicits/t5554.scala index d279abea7..d279abea7 100644 --- a/tests/untried/neg/t5554.scala +++ b/tests/untried/neg-with-implicits/t5554.scala diff --git a/tests/untried/neg/t5578.scala b/tests/untried/neg-with-implicits/t5578.scala index ce72f32d5..ce72f32d5 100644 --- a/tests/untried/neg/t5578.scala +++ b/tests/untried/neg-with-implicits/t5578.scala diff --git a/tests/untried/neg/t5728.scala b/tests/untried/neg-with-implicits/t5728.scala index 99337d06d..99337d06d 100644 --- a/tests/untried/neg/t5728.scala +++ b/tests/untried/neg-with-implicits/t5728.scala diff --git a/tests/untried/neg/t5801.scala b/tests/untried/neg-with-implicits/t5801.scala index d452222ac..d452222ac 100644 --- a/tests/untried/neg/t5801.scala +++ b/tests/untried/neg-with-implicits/t5801.scala diff --git a/tests/untried/neg/t5803.scala b/tests/untried/neg-with-implicits/t5803.scala index f818272f8..f818272f8 100644 --- a/tests/untried/neg/t5803.scala +++ b/tests/untried/neg-with-implicits/t5803.scala diff --git a/tests/untried/neg/t5839.scala b/tests/untried/neg-with-implicits/t5839.scala index d3a5d4b25..d3a5d4b25 100644 --- a/tests/untried/neg/t5839.scala +++ b/tests/untried/neg-with-implicits/t5839.scala diff --git a/tests/untried/neg/t5892.scala b/tests/untried/neg-with-implicits/t5892.scala index 5e3b2f313..5e3b2f313 100644 --- a/tests/untried/neg/t5892.scala +++ b/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 index 5d084ceed..5d084ceed 100644 --- a/tests/untried/neg/t5903a/Macros_1.scala +++ b/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 index 4d78dfb5e..4d78dfb5e 100644 --- a/tests/untried/neg/t5903a/Test_2.scala +++ b/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 index 6ce49c022..6ce49c022 100644 --- a/tests/untried/neg/t5903b/Macros_1.scala +++ b/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 index 0f6f80d32..0f6f80d32 100644 --- a/tests/untried/neg/t5903b/Test_2.scala +++ b/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 index 4792f0045..4792f0045 100644 --- a/tests/untried/neg/t5903c/Macros_1.scala +++ b/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 index a1fd31dd4..a1fd31dd4 100644 --- a/tests/untried/neg/t5903c/Test_2.scala +++ b/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 index 3500c2a78..3500c2a78 100644 --- a/tests/untried/neg/t5903d/Macros_1.scala +++ b/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 index 95c717a9d..95c717a9d 100644 --- a/tests/untried/neg/t5903d/Test_2.scala +++ b/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 index a64ff7e0b..a64ff7e0b 100644 --- a/tests/untried/neg/t5903e/Macros_1.scala +++ b/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 index d69d47243..d69d47243 100644 --- a/tests/untried/neg/t5903e/Test_2.scala +++ b/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 index 0f0b02395..0f0b02395 100644 --- a/tests/untried/neg/t591.scala +++ b/tests/untried/neg-with-implicits/t591.scala diff --git a/tests/untried/neg/t6074.scala b/tests/untried/neg-with-implicits/t6074.scala index 8c14f00f1..8c14f00f1 100644 --- a/tests/untried/neg/t6074.scala +++ b/tests/untried/neg-with-implicits/t6074.scala diff --git a/tests/untried/neg/t6083.scala b/tests/untried/neg-with-implicits/t6083.scala index 1de18e652..1de18e652 100644 --- a/tests/untried/neg/t6083.scala +++ b/tests/untried/neg-with-implicits/t6083.scala diff --git a/tests/untried/neg/t6120.scala b/tests/untried/neg-with-implicits/t6120.scala index 425f09db4..425f09db4 100644 --- a/tests/untried/neg/t6120.scala +++ b/tests/untried/neg-with-implicits/t6120.scala diff --git a/tests/untried/neg/t6227.scala b/tests/untried/neg-with-implicits/t6227.scala index 46416839d..46416839d 100644 --- a/tests/untried/neg/t6227.scala +++ b/tests/untried/neg-with-implicits/t6227.scala diff --git a/tests/untried/neg/t6263.scala b/tests/untried/neg-with-implicits/t6263.scala index 6575185b5..6575185b5 100644 --- a/tests/untried/neg/t6263.scala +++ b/tests/untried/neg-with-implicits/t6263.scala diff --git a/tests/untried/neg/t631.scala b/tests/untried/neg-with-implicits/t631.scala index 631db3eb1..631db3eb1 100644 --- a/tests/untried/neg/t631.scala +++ b/tests/untried/neg-with-implicits/t631.scala diff --git a/tests/untried/neg/t6335.scala b/tests/untried/neg-with-implicits/t6335.scala index 6c898af5b..6c898af5b 100644 --- a/tests/untried/neg/t6335.scala +++ b/tests/untried/neg-with-implicits/t6335.scala diff --git a/tests/untried/neg/t6436.scala b/tests/untried/neg-with-implicits/t6436.scala index 2c4050253..2c4050253 100644 --- a/tests/untried/neg/t6436.scala +++ b/tests/untried/neg-with-implicits/t6436.scala diff --git a/tests/untried/neg/t6436b.scala b/tests/untried/neg-with-implicits/t6436b.scala index 8023329e9..8023329e9 100644 --- a/tests/untried/neg/t6436b.scala +++ b/tests/untried/neg-with-implicits/t6436b.scala diff --git a/tests/untried/neg/t6567.scala b/tests/untried/neg-with-implicits/t6567.scala index 650e5e39a..650e5e39a 100644 --- a/tests/untried/neg/t6567.scala +++ b/tests/untried/neg-with-implicits/t6567.scala diff --git a/tests/untried/neg/t6597.scala b/tests/untried/neg-with-implicits/t6597.scala index dde53bcc8..dde53bcc8 100644 --- a/tests/untried/neg/t6597.scala +++ b/tests/untried/neg-with-implicits/t6597.scala diff --git a/tests/untried/neg/t6666d.scala b/tests/untried/neg-with-implicits/t6666d.scala index 49a688f91..49a688f91 100644 --- a/tests/untried/neg/t6666d.scala +++ b/tests/untried/neg-with-implicits/t6666d.scala diff --git a/tests/untried/neg/t6667.scala b/tests/untried/neg-with-implicits/t6667.scala index fb857ebd3..fb857ebd3 100644 --- a/tests/untried/neg/t6667.scala +++ b/tests/untried/neg-with-implicits/t6667.scala diff --git a/tests/untried/neg/t6667b.scala b/tests/untried/neg-with-implicits/t6667b.scala index db31c0a9b..db31c0a9b 100644 --- a/tests/untried/neg/t6667b.scala +++ b/tests/untried/neg-with-implicits/t6667b.scala diff --git a/tests/untried/neg/t6889.scala b/tests/untried/neg-with-implicits/t6889.scala index ef1963669..ef1963669 100644 --- a/tests/untried/neg/t6889.scala +++ b/tests/untried/neg-with-implicits/t6889.scala diff --git a/tests/untried/neg/t692.scala b/tests/untried/neg-with-implicits/t692.scala index 24e1d2fea..24e1d2fea 100644 --- a/tests/untried/neg/t692.scala +++ b/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 index 9e167e61d..9e167e61d 100644 --- a/tests/untried/neg/t6931/Macros_1.scala +++ b/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 index dbd7fc260..dbd7fc260 100644 --- a/tests/untried/neg/t6931/Test_2.scala +++ b/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 index ca76f7ef6..ca76f7ef6 100644 --- a/tests/untried/neg/t696.scala +++ b/tests/untried/neg-with-implicits/t696.scala diff --git a/tests/untried/neg/t712.scala b/tests/untried/neg-with-implicits/t712.scala index 6f2627743..6f2627743 100644 --- a/tests/untried/neg/t712.scala +++ b/tests/untried/neg-with-implicits/t712.scala diff --git a/tests/untried/neg/t7289.scala b/tests/untried/neg-with-implicits/t7289.scala index ad9340055..ad9340055 100644 --- a/tests/untried/neg/t7289.scala +++ b/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 index e1f9a9f8a..e1f9a9f8a 100644 --- a/tests/untried/neg/t7289_status_quo.scala +++ b/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 index 83e7f4cd1..83e7f4cd1 100644 --- a/tests/untried/neg/t729.scala +++ b/tests/untried/neg-with-implicits/t729.scala diff --git a/tests/untried/neg/t7509.scala b/tests/untried/neg-with-implicits/t7509.scala index 3cba801ea..3cba801ea 100644 --- a/tests/untried/neg/t7509.scala +++ b/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 index 55b583d24..55b583d24 100644 --- a/tests/untried/neg/t7519-b/Mac_1.scala +++ b/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 index 0d63eeed5..0d63eeed5 100644 --- a/tests/untried/neg/t7519-b/Use_2.scala +++ b/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 index aea0f35d8..aea0f35d8 100644 --- a/tests/untried/neg/t7519.scala +++ b/tests/untried/neg-with-implicits/t7519.scala diff --git a/tests/untried/neg/t7721.scala b/tests/untried/neg-with-implicits/t7721.scala index 9ac7b60f0..9ac7b60f0 100644 --- a/tests/untried/neg/t7721.scala +++ b/tests/untried/neg-with-implicits/t7721.scala diff --git a/tests/untried/neg/t8024.scala b/tests/untried/neg-with-implicits/t8024.scala index b4c2c5ebb..b4c2c5ebb 100644 --- a/tests/untried/neg/t8024.scala +++ b/tests/untried/neg-with-implicits/t8024.scala diff --git a/tests/untried/neg/t8024b.scala b/tests/untried/neg-with-implicits/t8024b.scala index cf3d49636..cf3d49636 100644 --- a/tests/untried/neg/t8024b.scala +++ b/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 index 129c8db16..129c8db16 100644 --- a/tests/untried/neg/t8104/Macros_1.scala +++ b/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 index a3bd94018..a3bd94018 100644 --- a/tests/untried/neg/t8104/Test_2.scala +++ b/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 index 60a674f4d..60a674f4d 100644 --- a/tests/untried/neg/t8372.scala +++ b/tests/untried/neg-with-implicits/t8372.scala diff --git a/tests/untried/neg/viewtest.scala b/tests/untried/neg-with-implicits/viewtest.scala index 5e7d624d2..5e7d624d2 100644 --- a/tests/untried/neg/viewtest.scala +++ b/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 index b7a2f1c41..b7a2f1c41 100644 --- a/tests/untried/neg/warn-unused-imports.scala +++ b/tests/untried/neg-with-implicits/warn-unused-imports.scala diff --git a/tests/untried/neg/t5543.scala b/tests/untried/neg/t5543.scala index 4e03e6e11..8fa4ef36f 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 2495c8727..01d0c0d9e 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 30cd21bd6..214f32437 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! } diff --git a/tests/untried/pos/SI-7638.scala b/tests/untried/pos/SI-7638.scala index 831475d00..ed581efe9 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 ce5ea476d..a9da1e976 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 0c587cf16..85be750b4 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 7e51861d6..aa8478056 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 598d3454c..4951c10a1 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 c034e3ef5..83171f865 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 d5bf0ecfd..f6b69c707 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 b0e775086..96edd01f3 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 cc3426307..437765598 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 fa5b7711f..dd1e7f9a9 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 15f2dba08..6cb5e29b4 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 4cd09f4a1..b347b0bc5 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 fc7109dcd..fcfdba51e 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 79df8e804..ccaee8052 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 d4b3967dd..ff2e8bc52 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 7e435d70b..3a5280640 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 2c701150e..0b9079062 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 da60c1ef3..2580592d9 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 0df346166..679b8a8d6 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 d212fb903..bd24cacd7 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 ab12aaf1f..3b387af80 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 6366548c6..55b72bed4 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 9b850966d..12dfce6ee 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 91768e201..b6594fb6c 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 8162fce72..ec95fed4d 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 54c1b86ce..be9cc371e 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 ed2c62770..8c4cbbbaf 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 7192d97f4..b2a4e301b 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 97ed9369e..3339631dc 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 129e97a52..41b1c296e 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 26dd1f73d..ac383f8c1 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 9d6667b6f..900a267fb 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 f32c1cad0..9a531a0cd 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 e1a6f49b8..13560e8ba 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 15582f6df..e46d29f47 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 253293e5f..05c1c0278 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 6dd7f4c4a..6ad096c7c 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 d55d3139e..b820447ce 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 70cfac062..4b7c7a223 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 21af170cf..96b7b4a3d 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) |