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

Remove Deprecations since before 3.2

4 files changed, 7 insertions, 29 deletions

diff --git a/src/main/scala/chisel3/util/BitPat.scala b/src/main/scala/chisel3/util/BitPat.scala
index b8a239d0..83475d1b 100644
--- a/src/main/scala/chisel3/util/BitPat.scala
+++ b/src/main/scala/chisel3/util/BitPat.scala
@@ -54,10 +54,6 @@ object BitPat {
     */
   def dontCare(width: Int): BitPat = BitPat("b" + ("?" * width))
 
-  @chiselRuntimeDeprecated
-  @deprecated("Use BitPat.dontCare", "chisel3")
-  def DC(width: Int): BitPat = dontCare(width)  // scalastyle:ignore method.name
-
   /** Allows BitPats to be used where a UInt is expected.
     *
     * @note the BitPat must not have don't care bits (will error out otherwise)
@@ -95,7 +91,7 @@ object BitPat {
 
     final def != (that: BitPat): Bool = macro SourceInfoTransform.thatArg
     @chiselRuntimeDeprecated
-    @deprecated("Use '=/=', which avoids potential precedence problems", "chisel3")
+    @deprecated("Use '=/=', which avoids potential precedence problems", "3.0")
     def do_!= (that: BitPat)  // scalastyle:ignore method.name
               (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Bool = that != x
   }
@@ -128,7 +124,7 @@ sealed class BitPat(val value: BigInt, val mask: BigInt, width: Int) extends Sou
 
   def != (that: UInt): Bool = macro SourceInfoTransform.thatArg
   @chiselRuntimeDeprecated
-  @deprecated("Use '=/=', which avoids potential precedence problems", "chisel3")
+  @deprecated("Use '=/=', which avoids potential precedence problems", "3.0")
   def do_!= (that: UInt)  // scalastyle:ignore method.name
       (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Bool = {
     this =/= that
diff --git a/src/main/scala/chisel3/util/Decoupled.scala b/src/main/scala/chisel3/util/Decoupled.scala
index 0aa72e81..36892c11 100644
--- a/src/main/scala/chisel3/util/Decoupled.scala
+++ b/src/main/scala/chisel3/util/Decoupled.scala
@@ -191,16 +191,6 @@ class Queue[T <: Data](gen: T,
                        flow: Boolean = false)
                       (implicit compileOptions: chisel3.CompileOptions)
     extends Module() {
-  @deprecated("Module constructor with override _reset deprecated, use withReset", "chisel3")
-  def this(gen: T, entries: Int, pipe: Boolean, flow: Boolean, override_reset: Option[Bool]) = {
-    this(gen, entries, pipe, flow)
-    this.override_reset = override_reset
-  }
-  @deprecated("Module constructor with override _reset deprecated, use withReset", "chisel3")
-  def this(gen: T, entries: Int, pipe: Boolean, flow: Boolean, _reset: Bool) = {
-    this(gen, entries, pipe, flow)
-    this.override_reset = Some(_reset)
-  }
 
   val genType = if (compileOptions.declaredTypeMustBeUnbound) {
     requireIsChiselType(gen)
diff --git a/src/main/scala/chisel3/util/Enum.scala b/src/main/scala/chisel3/util/Enum.scala
index eaec3c04..3fb9f9e4 100644
--- a/src/main/scala/chisel3/util/Enum.scala
+++ b/src/main/scala/chisel3/util/Enum.scala
@@ -39,12 +39,4 @@ trait Enum {
   def apply(n: Int): List[UInt] = createValues(n).toList
 }
 
-object Enum extends Enum {
-  @chiselRuntimeDeprecated
-  @deprecated("use Enum(n)", "chisel3, will be removed soon")
-  def apply[T <: Bits](nodeType: T, n: Int): List[T] = {
-    require(nodeType.isInstanceOf[UInt], "Only UInt supported for enums")
-    require(!nodeType.widthKnown, "Bit width may no longer be specified for enums")
-    apply(n).asInstanceOf[List[T]]
-  }
-}
+object Enum extends Enum
diff --git a/src/main/scala/chisel3/util/LFSR.scala b/src/main/scala/chisel3/util/LFSR.scala
index 0458bd90..5fc778fb 100644
--- a/src/main/scala/chisel3/util/LFSR.scala
+++ b/src/main/scala/chisel3/util/LFSR.scala
@@ -36,10 +36,10 @@ object LFSR16 {
   @deprecated("Use chisel3.util.random.LFSR(16) for a 16-bit LFSR", "3.2")
   @chiselName
   def apply(increment: Bool = true.B): UInt =
-    Vec( FibonacciLFSR
-          .maxPeriod(16, increment, seed = Some(BigInt(1) << 15))
-          .asBools
-          .reverse )
+    VecInit( FibonacciLFSR
+              .maxPeriod(16, increment, seed = Some(BigInt(1) << 15))
+              .asBools
+              .reverse )
       .asUInt
 
 }