Merge pull request #1139 from freechipsproject/deprecations-are-serious-business

Remove Deprecations since before 3.2

1 files changed, 2 insertions, 32 deletions

diff --git a/chiselFrontend/src/main/scala/chisel3/Data.scala b/chiselFrontend/src/main/scala/chisel3/Data.scala
index 7534c01a..37c9622f 100644
--- a/chiselFrontend/src/main/scala/chisel3/Data.scala
+++ b/chiselFrontend/src/main/scala/chisel3/Data.scala
@@ -110,12 +110,6 @@ object ActualDirection {
   }
 }
 
-object debug {  // scalastyle:ignore object.name
-  @chiselRuntimeDeprecated
-  @deprecated("debug doesn't do anything in Chisel3 as no pruning happens in the frontend", "chisel3")
-  def apply (arg: Data): Data = arg
-}
-
 package experimental {
 
   /** Experimental hardware construction reflection API
@@ -494,7 +488,7 @@ abstract class Data extends HasId with NamedComponent with SourceInfoDoc { // sc
   final def <> (that: Data)(implicit sourceInfo: SourceInfo, connectionCompileOptions: CompileOptions): Unit = this.bulkConnect(that)(sourceInfo, connectionCompileOptions) // scalastyle:ignore line.size.limit
 
   @chiselRuntimeDeprecated
-  @deprecated("litArg is deprecated, use litOption or litTo*Option", "chisel3.2")
+  @deprecated("litArg is deprecated, use litOption or litTo*Option", "3.2")
   def litArg(): Option[LitArg] = topBindingOpt match {
     case Some(ElementLitBinding(litArg)) => Some(litArg)
     case Some(BundleLitBinding(litMap)) => None  // this API does not support Bundle literals
@@ -522,14 +516,6 @@ abstract class Data extends HasId with NamedComponent with SourceInfoDoc { // sc
   /** Returns Some(width) if the width is known, else None. */
   final def widthOption: Option[Int] = if (isWidthKnown) Some(getWidth) else None
 
-  /** Packs the value of this object as plain Bits.
-    *
-    * This performs the inverse operation of fromBits(Bits).
-    */
-  @chiselRuntimeDeprecated
-  @deprecated("Best alternative, .asUInt()", "chisel3")
-  def toBits(implicit compileOptions: CompileOptions): UInt = do_asUInt(DeprecatedSourceInfo, compileOptions)
-
   /** Does a reinterpret cast of the bits in this node into the format that provides.
     * Returns a new Wire of that type. Does not modify existing nodes.
     *
@@ -610,23 +596,7 @@ trait WireFactory {
   * }}}
   *
   */
-object Wire extends WireFactory {
-
-  @chiselRuntimeDeprecated
-  @deprecated("Wire(init=init) is deprecated, use WireDefault(init) instead", "chisel3")
-  def apply[T <: Data](dummy: Int = 0, init: T)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): T =
-    WireDefault(init)
-
-  @chiselRuntimeDeprecated
-  @deprecated("Wire(t, init) is deprecated, use WireDefault(t, init) instead", "chisel3")
-  def apply[T <: Data](t: T, init: T)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): T =
-    WireDefault(t, init)
-
-  @chiselRuntimeDeprecated
-  @deprecated("Wire(t, init) is deprecated, use WireDefault(t, init) instead", "chisel3")
-  def apply[T <: Data](t: T, init: DontCare.type)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): T =
-    WireDefault(t, init)
-}
+object Wire extends WireFactory
 
 /** Utility for constructing hardware wires with a default connection
   *