Make context bounds for poly functions a standard feature (#22019)

KacperFKorban · web-flow · commit e89a66cefb21 · 2024-11-25T16:38:36.000+01:00
closes #22017
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -3491,7 +3491,7 @@ object Parsers {
           val hkparams = typeParamClauseOpt(ParamOwner.Hk)
           val bounds =
             if paramOwner.acceptsCtxBounds then typeAndCtxBounds(name)
-            else if in.featureEnabled(Feature.modularity) && paramOwner == ParamOwner.Type then typeAndCtxBounds(name)
+            else if sourceVersion.isAtLeast(`3.6`) && paramOwner == ParamOwner.Type then typeAndCtxBounds(name)
             else typeBounds()
           TypeDef(name, lambdaAbstract(hkparams, bounds)).withMods(mods)
         }
diff --git a/tests/pos/contextbounds-for-poly-functions.scala b/tests/pos/contextbounds-for-poly-functions.scala
@@ -1,6 +1,3 @@
-import scala.language.experimental.modularity
-import scala.language.future
-
 trait Ord[X]:
   def compare(x: X, y: X): Int
   type T
diff --git a/tests/run/contextbounds-for-poly-functions.scala b/tests/run/contextbounds-for-poly-functions.scala
@@ -1,6 +1,3 @@
-import scala.language.experimental.modularity
-import scala.language.future
-
 trait Show[X]:
   def show(x: X): String
 

Original file line number	Diff line number	Diff line change
`@@ -3491,7 +3491,7 @@ object Parsers {`
`3491`	`3491`	`val hkparams = typeParamClauseOpt(ParamOwner.Hk)`
`3492`	`3492`	`val bounds =`
`3493`	`3493`	`if paramOwner.acceptsCtxBounds then typeAndCtxBounds(name)`
`3494`		`- else if in.featureEnabled(Feature.modularity) && paramOwner == ParamOwner.Type then typeAndCtxBounds(name)`
	`3494`	+ else if sourceVersion.isAtLeast(`3.6`) && paramOwner == ParamOwner.Type then typeAndCtxBounds(name)
`3495`	`3495`	`else typeBounds()`
`3496`	`3496`	`TypeDef(name, lambdaAbstract(hkparams, bounds)).withMods(mods)`
`3497`	`3497`	`}`