Rename methods to remove unnecessary names in StdNames

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -714,8 +714,8 @@ class Definitions {
 
   @tu lazy val InternalQuotedExprModule: Symbol = requiredModule("scala.internal.quoted.Expr")
     @tu lazy val InternalQuotedExpr_unapply: Symbol = InternalQuotedExprModule.requiredMethod(nme.unapply)
-    @tu lazy val InternalQuotedExpr_nullExpr: Symbol = InternalQuotedExprModule.requiredMethod(nme.nullExpr)
-    @tu lazy val InternalQuotedExpr_unitExpr: Symbol = InternalQuotedExprModule.requiredMethod(nme.unitExpr)
+    @tu lazy val InternalQuotedExpr_null: Symbol = InternalQuotedExprModule.requiredMethod(nme.null_)
+    @tu lazy val InternalQuotedExpr_unit: Symbol = InternalQuotedExprModule.requiredMethod(nme.Unit)
 
   @tu lazy val InternalQuotedTypeModule: Symbol = requiredModule("scala.internal.quoted.Type")
     @tu lazy val InternalQuotedType_unapply: Symbol = InternalQuotedTypeModule.requiredMethod(nme.unapply)

compiler/src/dotty/tools/dotc/core/StdNames.scala

@@ -535,7 +535,6 @@ object StdNames {
     val notifyAll_ : N          = "notifyAll"
     val notify_ : N             = "notify"
     val null_ : N               = "null"
-    val nullExpr: N             = "nullExpr"
     val ofDim: N                = "ofDim"
     val on: N                   = "on"
     val opaque: N               = "opaque"
@@ -608,7 +607,6 @@ object StdNames {
     val unapply: N              = "unapply"
     val unapplySeq: N           = "unapplySeq"
     val unbox: N                = "unbox"
-    val unitExpr: N             = "unitExpr"
     val universe: N             = "universe"
     val update: N               = "update"
     val updateDynamic: N        = "updateDynamic"

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

@@ -150,8 +150,8 @@ class ReifyQuotes extends MacroTransform {
         def liftedValue(lifter: Symbol) =
           ref(lifter).appliedToType(originalTp).select(nme.toExpr).appliedTo(lit)
         lit.const.tag match {
-          case Constants.NullTag => ref(defn.InternalQuotedExpr_nullExpr)
-          case Constants.UnitTag => ref(defn.InternalQuotedExpr_unitExpr)
+          case Constants.NullTag => ref(defn.InternalQuotedExpr_null)
+          case Constants.UnitTag => ref(defn.InternalQuotedExpr_unit)
           case Constants.BooleanTag => liftedValue(defn.LiftableModule_BooleanIsLiftable)
           case Constants.ByteTag => liftedValue(defn.LiftableModule_ByteIsLiftable)
           case Constants.ShortTag => liftedValue(defn.LiftableModule_ShortIsLiftable)

library/src/scala/internal/quoted/Expr.scala

@@ -55,15 +55,14 @@ object Expr {
     new Matcher.QuoteMatcher[qctx.type].termMatch(scrutineeExpr.unseal, patternExpr.unseal, hasTypeSplices).asInstanceOf[Option[Tup]]
   }
 
-
   /** Returns a null expresssion equivalent to `'{null}` */
-  def nullExpr: QuoteContext ?=> Expr[Null] = qctx ?=> {
+  def `null`: QuoteContext ?=> Expr[Null] = qctx ?=> {
     import qctx.tasty._
     Literal(Constant(null)).seal.asInstanceOf[Expr[Null]]
   }
 
   /** Returns a unit expresssion equivalent to `'{}` or `'{()}` */
-  def unitExpr: QuoteContext ?=> Expr[Unit] = qctx ?=> {
+  def Unit: QuoteContext ?=> Expr[Unit] = qctx ?=> {
     import qctx.tasty._
     Literal(Constant(())).seal.asInstanceOf[Expr[Unit]]
   }