aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer/Typer.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-11-08 10:33:58 +0100
committerMartin Odersky <odersky@gmail.com>2015-11-09 15:45:40 +0100
commit4f01f62ac216fa9034d343828aa6f4be626d9b36 (patch)
tree9a0dbba0554183199aa3f1389e7e166851073bb8 /src/dotty/tools/dotc/typer/Typer.scala
parent2d7a05fa46016ea54e10a80735e04b33fd0938d1 (diff)
downloaddotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.tar.gz
dotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.tar.bz2
dotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.zip
Shorten ..Class.typeRef to ..Type
Since we now have two forms of (almost) everything in Definitions, might as well profit from it.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
-rw-r--r--src/dotty/tools/dotc/typer/Typer.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index c621d96c4..10bca44bf 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -373,7 +373,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
def regularTyped(isWildcard: Boolean) = {
val tpt1 =
if (untpd.isWildcardStarArg(tree))
- TypeTree(defn.SeqClass.typeRef.appliedTo(pt :: Nil))
+ TypeTree(defn.SeqType.appliedTo(pt :: Nil))
else
checkSimpleKinded(typedType(tree.tpt))
val expr1 =
@@ -891,7 +891,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
}
def typedAnnotation(annot: untpd.Tree)(implicit ctx: Context): Tree = track("typedAnnotation") {
- typed(annot, defn.AnnotationClass.typeRef)
+ typed(annot, defn.AnnotationType)
}
def typedValDef(vdef: untpd.ValDef, sym: Symbol)(implicit ctx: Context) = track("typedValDef") {
@@ -1034,7 +1034,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
}
def typedAnnotated(tree: untpd.Annotated, pt: Type)(implicit ctx: Context): Tree = track("typedAnnotated") {
- val annot1 = typedExpr(tree.annot, defn.AnnotationClass.typeRef)
+ val annot1 = typedExpr(tree.annot, defn.AnnotationType)
val arg1 = typed(tree.arg, pt)
if (ctx.mode is Mode.Type)
assignType(cpy.Annotated(tree)(annot1, arg1), annot1, arg1)