Remove toNamed (and friends) deprecation. (#1449)

* Remove toNamed (and friends) deprecation.

* Add inadvertently deleted leading double quote.

* Remove commented out deprecations.

2 files changed, 0 insertions, 25 deletions

diff --git a/src/main/scala/firrtl/RenameMap.scala b/src/main/scala/firrtl/RenameMap.scala
index bdcb785a..61f1d8f9 100644
--- a/src/main/scala/firrtl/RenameMap.scala
+++ b/src/main/scala/firrtl/RenameMap.scala
@@ -9,7 +9,6 @@ import firrtl.annotations.TargetToken.{Field, Index, Instance, OfModule}
 import scala.collection.mutable
 
 object RenameMap {
-  @deprecated("Use create with CompleteTarget instead, this will be removed in 1.3", "1.2")
   def apply(map: collection.Map[Named, Seq[Named]]): RenameMap = {
     val rm = new RenameMap
     rm.addMap(map)
@@ -138,7 +137,6 @@ final class RenameMap private (val underlying: mutable.HashMap[CompleteTarget, S
     * @param renameMap
     * @return
     */
-  @deprecated("will be removed in 1.3", "1.2")
   def ++ (renameMap: RenameMap): RenameMap = {
     val newChained = if (chained.nonEmpty && renameMap.chained.nonEmpty) {
       Some(chained.get ++ renameMap.chained.get)
@@ -511,47 +509,35 @@ final class RenameMap private (val underlying: mutable.HashMap[CompleteTarget, S
 
   /* DEPRECATED ACCESSOR/SETTOR METHODS WITH [[firrtl.ir.Named Named]] */
 
-  @deprecated("Use record with CircuitTarget instead, this will be removed in 1.3", "1.2")
   def rename(from: Named, to: Named): Unit = rename(from, Seq(to))
 
-  @deprecated("Use record with IsMember instead, this will be removed in 1.3", "1.2")
   def rename(from: Named, tos: Seq[Named]): Unit = recordAll(Map(from.toTarget -> tos.map(_.toTarget)))
 
-  @deprecated("Use record with IsMember instead, this will be removed in 1.3", "1.2")
   def rename(from: ComponentName, to: ComponentName): Unit = record(from, to)
 
-  @deprecated("Use record with IsMember instead, this will be removed in 1.3", "1.2")
   def rename(from: ComponentName, tos: Seq[ComponentName]): Unit = record(from, tos.map(_.toTarget))
 
-  @deprecated("Use delete with CircuitTarget instead, this will be removed in 1.3", "1.2")
   def delete(name: CircuitName): Unit = underlying(name) = Seq.empty
 
-  @deprecated("Use delete with IsMember instead, this will be removed in 1.3", "1.2")
   def delete(name: ModuleName): Unit = underlying(name) = Seq.empty
 
-  @deprecated("Use delete with IsMember instead, this will be removed in 1.3", "1.2")
   def delete(name: ComponentName): Unit = underlying(name) = Seq.empty
 
-  @deprecated("Use recordAll with CompleteTarget instead, this will be removed in 1.3", "1.2")
   def addMap(map: collection.Map[Named, Seq[Named]]): Unit =
     recordAll(map.map { case (key, values) => (Target.convertNamed2Target(key), values.map(Target.convertNamed2Target)) })
 
-  @deprecated("Use get with CircuitTarget instead, this will be removed in 1.3", "1.2")
   def get(key: CircuitName): Option[Seq[CircuitName]] = {
     get(Target.convertCircuitName2CircuitTarget(key)).map(_.collect{ case c: CircuitTarget => c.toNamed })
   }
 
-  @deprecated("Use get with IsMember instead, this will be removed in 1.3", "1.2")
   def get(key: ModuleName): Option[Seq[ModuleName]] = {
     get(Target.convertModuleName2ModuleTarget(key)).map(_.collect{ case m: ModuleTarget => m.toNamed })
   }
 
-  @deprecated("Use get with IsMember instead, this will be removed in 1.3", "1.2")
   def get(key: ComponentName): Option[Seq[ComponentName]] = {
     get(Target.convertComponentName2ReferenceTarget(key)).map(_.collect{ case c: IsComponent => c.toNamed })
   }
 
-  @deprecated("Use get with IsMember instead, this will be removed in 1.3", "1.2")
   def get(key: Named): Option[Seq[Named]] = key match {
     case t: CompleteTarget => get(t)
     case other => get(key.toTarget).map(_.collect{ case c: IsComponent => c.toNamed })
@@ -565,20 +551,17 @@ final class RenameMap private (val underlying: mutable.HashMap[CompleteTarget, S
   /** Sets mutable state to record current module we are visiting
     * @param module
     */
-  @deprecated("Use typesafe rename defs instead, this will be removed in 1.3", "1.2")
   def setModule(module: String): Unit = moduleName = module
 
   /** Sets mutable state to record current circuit we are visiting
     * @param circuit
     */
-  @deprecated("Use typesafe rename defs instead, this will be removed in 1.3", "1.2")
   def setCircuit(circuit: String): Unit = circuitName = circuit
 
   /** Records how a reference maps to a new reference
     * @param from
     * @param to
     */
-  @deprecated("Use typesafe rename defs instead, this will be removed in 1.3", "1.2")
   def rename(from: String, to: String): Unit = rename(from, Seq(to))
 
   /** Records how a reference maps to a new reference
@@ -586,7 +569,6 @@ final class RenameMap private (val underlying: mutable.HashMap[CompleteTarget, S
     * @param from
     * @param tos
     */
-  @deprecated("Use typesafe rename defs instead, this will be removed in 1.3", "1.2")
   def rename(from: String, tos: Seq[String]): Unit = {
     val mn = ModuleName(moduleName, CircuitName(circuitName))
     val fromName = ComponentName(from, mn).toTarget
@@ -598,7 +580,6 @@ final class RenameMap private (val underlying: mutable.HashMap[CompleteTarget, S
     * The reference's root module and circuit are determined by whomever called setModule or setCircuit last
     * @param name
     */
-  @deprecated("Use typesafe rename defs instead, this will be removed in 1.3", "1.2")
   def delete(name: String): Unit = {
     Target(Some(circuitName), Some(moduleName), AnnotationUtils.toSubComponents(name)).getComplete match {
       case Some(t: CircuitTarget) => delete(t)
@@ -611,6 +592,5 @@ final class RenameMap private (val underlying: mutable.HashMap[CompleteTarget, S
     * The reference's root module and circuit are determined by whomever called setModule or setCircuit last
     * @param names
     */
-  @deprecated("Use typesafe rename defs instead, this will be removed in 1.3", "1.2")
   def delete(names: Seq[String]): Unit = names.foreach(delete(_))
 }
diff --git a/src/main/scala/firrtl/annotations/Target.scala b/src/main/scala/firrtl/annotations/Target.scala
index c7cb98d2..254e2dfd 100644
--- a/src/main/scala/firrtl/annotations/Target.scala
+++ b/src/main/scala/firrtl/annotations/Target.scala
@@ -86,7 +86,6 @@ sealed trait Target extends Named {
   def toGenericTarget: GenericTarget = GenericTarget(circuitOpt, moduleOpt, tokens.toVector)
 
   /** @return Converts this [[Target]] into either a [[CircuitName]], [[ModuleName]], or [[ComponentName]] */
-  @deprecated("Use Target instead, will be removed in 1.3", "1.2")
   def toNamed: Named = toGenericTarget.toNamed
 
   /** @return If legal, convert this [[Target]] into a [[CompleteTarget]] */
@@ -692,27 +691,23 @@ case class InstanceTarget(circuit: String,
 
 
 /** Named classes associate an annotation with a component in a Firrtl circuit */
-@deprecated("Use Target instead, will be removed in 1.3", "1.2")
 sealed trait Named {
   def serialize: String
   def toTarget: CompleteTarget
 }
 
-@deprecated("Use Target instead, will be removed in 1.3", "1.2")
 final case class CircuitName(name: String) extends Named {
   if(!validModuleName(name)) throw AnnotationException(s"Illegal circuit name: $name")
   def serialize: String = name
   def toTarget: CircuitTarget = CircuitTarget(name)
 }
 
-@deprecated("Use Target instead, will be removed in 1.3", "1.2")
 final case class ModuleName(name: String, circuit: CircuitName) extends Named {
   if(!validModuleName(name)) throw AnnotationException(s"Illegal module name: $name")
   def serialize: String = circuit.serialize + "." + name
   def toTarget: ModuleTarget = ModuleTarget(circuit.name, name)
 }
 
-@deprecated("Use Target instead, will be removed in 1.3", "1.2")
 final case class ComponentName(name: String, module: ModuleName) extends Named {
   if(!validComponentName(name)) throw AnnotationException(s"Illegal component name: $name")
   def expr: Expression = toExp(name)