Cleanup of TermRef.withSym and TypeRef.withSym

All occurrences replaced by select, or second version of Term/TypeRef.apply

4 files changed, 7 insertions, 7 deletions

diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala
index ae9a70c34..901d44800 100644
--- a/src/dotty/tools/dotc/typer/Applications.scala
+++ b/src/dotty/tools/dotc/typer/Applications.scala
@@ -195,7 +195,7 @@ trait Applications extends Compatibility { self: Typer =>
     def findDefaultGetter(n: Int)(implicit ctx: Context): Type = {
       def getterName = methRef.name.toTermName.defaultGetterName(n)
       def ref(pre: Type, sym: Symbol): Type =
-        if (pre.exists && sym.isTerm) TermRef.withSym(pre, sym.asTerm) else NoType
+        if (pre.exists && sym.isTerm) pre select sym else NoType
       val meth = methRef.symbol
       if (meth.hasDefaultParams)
         methRef.prefix match {
diff --git a/src/dotty/tools/dotc/typer/Implicits.scala b/src/dotty/tools/dotc/typer/Implicits.scala
index c39b409c8..dbe86d3c9 100644
--- a/src/dotty/tools/dotc/typer/Implicits.scala
+++ b/src/dotty/tools/dotc/typer/Implicits.scala
@@ -193,8 +193,8 @@ trait ImplicitRunInfo { self: RunInfo =>
         comps ++= implicitScope(pre).companionRefs
         def addClassScope(cls: ClassSymbol): Unit = {
           def addRef(companion: TermRef): Unit = {
-            val comp1 @ TermRef(p, _) = companion.asSeenFrom(pre, companion.symbol.owner)
-            comps += TermRef.withSym(p, comp1.symbol.asTerm).withDenot(comp1.denot)
+            val comp1 @ TermRef(_, _) = companion.asSeenFrom(pre, companion.symbol.owner)
+            comps += comp1
           }
           def addParentScope(parent: TypeRef): Unit = {
             implicitScope(parent).companionRefs foreach addRef
@@ -420,5 +420,5 @@ class TermRefSet(implicit ctx: Context) extends mutable.Traversable[TermRef] {
   override def foreach[U](f: TermRef => U): Unit =
     for (sym <- elems.keysIterator)
       for (pre <- elems(sym))
-        f(TermRef.withSym(pre, sym))
+        f(TermRef(pre, sym))
 }
\ No newline at end of file
diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/src/dotty/tools/dotc/typer/Namer.scala
index 4c3166bd9..09ce41167 100644
--- a/src/dotty/tools/dotc/typer/Namer.scala
+++ b/src/dotty/tools/dotc/typer/Namer.scala
@@ -338,7 +338,7 @@ class Namer { typer: Typer =>
             case sig: TypeRef =>
               sig
             case sig: ClassInfo =>
-              sig.derivedClassInfo(sig.prefix, sig.classParents, TermRef.withSym(sig.prefix, sourceModule.asTerm))
+              sig.derivedClassInfo(sig.prefix, sig.classParents, sig.prefix select sourceModule)
             case _ =>
               sig
           }
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index 74ad45390..a4b968c9a 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -574,7 +574,7 @@ class Typer extends Namer with Applications with Implicits {
       else cx.tree match {
         case ddef: DefDef =>
           val meth = ddef.symbol
-          val from = Ident(TermRef.withSym(NoPrefix, meth.asTerm))
+          val from = Ident(TermRef(NoPrefix, meth.asTerm))
           val proto =
             if (meth.isConstructor)
               defn.UnitType
@@ -695,7 +695,7 @@ class Typer extends Namer with Applications with Implicits {
   def typedBind(tree: untpd.Bind, pt: Type)(implicit ctx: Context): Bind = track("typedBind") {
     val body1 = typed(tree.body, pt)
     val sym = ctx.newSymbol(ctx.owner, tree.name.asTermName, EmptyFlags, pt, coord = tree.pos)
-    cpy.Bind(tree, tree.name, body1) withType TermRef.withSym(NoPrefix, sym)
+    cpy.Bind(tree, tree.name, body1) withType TermRef(NoPrefix, sym)
   }
 
   def typedAlternative(tree: untpd.Alternative, pt: Type)(implicit ctx: Context): Alternative = track("typedAlternative") {