Skip to content

Commit 83c47fc

Browse files
Merge pull request scala#10060 from dotty-staging/make-use-of-old-type-syntax-an-error-in-3.1
Make use of old type syntax an error in 3.1
2 parents b40e33d + 8dce9cc commit 83c47fc

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package typer
33

44
import dotty.tools.dotc.ast._
55
import dotty.tools.dotc.ast.Trees._
6+
import dotty.tools.dotc.config.Feature._
7+
import dotty.tools.dotc.config.SourceVersion._
68
import dotty.tools.dotc.core._
79
import dotty.tools.dotc.core.Annotations._
810
import dotty.tools.dotc.core.Constants._
@@ -58,7 +60,9 @@ trait QuotesAndSplices {
5860
if ctx.mode.is(Mode.Pattern) then
5961
typedQuotePattern(tree, pt, qctx)
6062
else if tree.quoted.isType then
61-
report.warning(em"Consider using canonical type constructor scala.quoted.Type[${tree.quoted}] instead", tree.srcPos)
63+
val msg = em"Consider using canonical type constructor scala.quoted.Type[${tree.quoted}] instead"
64+
if sourceVersion.isAtLeast(`3.1-migration`) then report.error(msg, tree.srcPos)
65+
else report.warning(msg, tree.srcPos)
6266
typedTypeApply(untpd.TypeApply(untpd.ref(defn.QuotedTypeModule_apply.termRef), tree.quoted :: Nil), pt)(using quoteContext).select(nme.apply).appliedTo(qctx)
6367
else
6468
typedApply(untpd.Apply(untpd.ref(defn.InternalQuoted_exprQuote.termRef), tree.quoted), pt)(using pushQuoteContext(qctx)).select(nme.apply).appliedTo(qctx)
@@ -175,7 +179,9 @@ trait QuotesAndSplices {
175179
pat.select(tpnme.spliceType)
176180
else
177181
val tree1 = typedSelect(untpd.Select(tree.expr, tpnme.spliceType), pt)(using spliceContext).withSpan(tree.span)
178-
report.warning(em"Consider using canonical type reference ${tree1.tpe.show} instead", tree.srcPos)
182+
val msg = em"Consider using canonical type reference ${tree1.tpe} instead"
183+
if sourceVersion.isAtLeast(`3.1-migration`) then report.error(msg, tree.srcPos)
184+
else report.warning(msg, tree.srcPos)
179185
tree1
180186
}
181187

0 commit comments

Comments
 (0)