Skip to content

Commit dd81b27

Browse files
authored
Delete many old deprecated APIs (#3733)
1 parent 77a3bff commit dd81b27

File tree

19 files changed

+16
-143
lines changed

19 files changed

+16
-143
lines changed

core/src/main/scala/chisel3/Aggregate.scala

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import scala.collection.immutable.{SeqMap, VectorMap}
99
import scala.collection.mutable.{HashSet, LinkedHashMap}
1010
import scala.language.experimental.macros
1111
import chisel3.experimental.{BaseModule, BundleLiteralException, HasTypeAlias, OpaqueType, VecLiteralException}
12-
import chisel3.experimental.{SourceInfo, UnlocatableSourceInfo}
12+
import chisel3.experimental.{requireIsChiselType, requireIsHardware, SourceInfo, UnlocatableSourceInfo}
1313
import chisel3.internal._
1414
import chisel3.internal.Builder.pushCommand
1515
import chisel3.internal.firrtl.ir._
@@ -1324,16 +1324,6 @@ package experimental {
13241324
class BundleLiteralException(message: String) extends chisel3.ChiselException(message)
13251325
class VecLiteralException(message: String) extends chisel3.ChiselException(message)
13261326

1327-
/** Indicates that the compiler plugin should generate [[cloneType]] for this type
1328-
*
1329-
* All user-defined [[Record]]s should mix this trait in as it will be required for upgrading to Chisel 3.6.
1330-
*/
1331-
@deprecated("AutoCloneType is now always enabled, no need to mix it in", "Chisel 3.6")
1332-
trait AutoCloneType { self: Record =>
1333-
1334-
override def cloneType: this.type = _cloneTypeImpl.asInstanceOf[this.type]
1335-
1336-
}
13371327
}
13381328

13391329
/** Base class for data types defined as a bundle of other data types.

core/src/main/scala/chisel3/Const.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
package chisel3
44

55
import chisel3._
6-
import chisel3.internal.{requireIsChiselType, requireNoProbeTypeModifier, Builder}
7-
import chisel3.experimental.SourceInfo
6+
import chisel3.internal.{requireNoProbeTypeModifier, Builder}
7+
import chisel3.experimental.{requireIsChiselType, SourceInfo}
88

99
/** Create a constant type in FIRRTL, which is guaranteed to take a single
1010
* constant value.

core/src/main/scala/chisel3/Data.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package chisel3
55
import chisel3.experimental.dataview.reify
66

77
import scala.language.experimental.macros
8-
import chisel3.experimental.{Analog, BaseModule}
8+
import chisel3.experimental.{requireIsChiselType, requireIsHardware, Analog, BaseModule}
99
import chisel3.experimental.{prefix, SourceInfo, UnlocatableSourceInfo}
1010
import chisel3.experimental.dataview.reifySingleData
1111
import chisel3.internal.Builder.pushCommand

core/src/main/scala/chisel3/IO.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package chisel3
22

3-
import chisel3.internal.requireIsChiselType // Fix ambiguous import
43
import chisel3.internal.{throwException, Builder}
5-
import chisel3.experimental.{noPrefix, SourceInfo}
4+
import chisel3.experimental.{noPrefix, requireIsChiselType, SourceInfo}
65
import chisel3.properties.{Class, Property}
76
import chisel3.reflect.DataMirror.internal.chiselTypeClone
87

core/src/main/scala/chisel3/Mem.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import chisel3.internal._
1010
import chisel3.internal.Builder.pushCommand
1111
import chisel3.internal.firrtl.ir._
1212
import chisel3.internal.sourceinfo.{MemTransform, SourceInfoTransform}
13-
import chisel3.experimental.{SourceInfo, SourceLine}
13+
import chisel3.experimental.{requireIsChiselType, requireIsHardware, SourceInfo, SourceLine}
1414

1515
object Mem {
1616

core/src/main/scala/chisel3/Module.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import scala.language.experimental.macros
99
import chisel3.internal._
1010
import chisel3.internal.Builder._
1111
import chisel3.internal.firrtl.ir._
12-
import chisel3.experimental.{BaseModule, SourceInfo, UnlocatableSourceInfo}
12+
import chisel3.experimental.{requireIsChiselType, BaseModule, SourceInfo, UnlocatableSourceInfo}
1313
import chisel3.internal.sourceinfo.{InstTransform}
1414
import chisel3.properties.{Class, Property}
1515
import chisel3.reflect.DataMirror
@@ -719,7 +719,7 @@ package experimental {
719719
// data must be a fresh Chisel type
720720
private[chisel3] def createSecretIO[A <: Data](data: => A)(implicit sourceInfo: SourceInfo): A = {
721721
val iodef = data
722-
internal.requireIsChiselType(iodef, "io type")
722+
requireIsChiselType(iodef, "io type")
723723
require(!isFullyClosed, "Cannot create secret ports if module is fully closed")
724724

725725
Module.assignCompatDir(iodef)

core/src/main/scala/chisel3/Reg.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import scala.language.experimental.macros
77
import chisel3.internal._
88
import chisel3.internal.Builder.pushCommand
99
import chisel3.internal.firrtl.ir._
10-
import chisel3.experimental.SourceInfo
10+
import chisel3.experimental.{requireIsChiselType, requireIsHardware, SourceInfo}
1111
import chisel3.internal.sourceinfo.SourceInfoTransform
1212

1313
/** Utility for constructing hardware registers

core/src/main/scala/chisel3/experimental/dataview/package.scala

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,6 @@ package object dataview {
3737
}
3838
}
3939

40-
/** Provides `viewAsSupertype` for subclasses of [[Bundle]] */
41-
@deprecated("Use RecordUpcastable instead", "chisel3.6")
42-
implicit class BundleUpcastable[T <: Bundle](target: T) {
43-
44-
/** View a [[Bundle]] or [[Record]] as a parent type (upcast) */
45-
def viewAsSupertype[V <: Bundle](proto: V)(implicit ev: ChiselSubtypeOf[T, V], sourceInfo: SourceInfo): V = {
46-
implicit val dataView = PartialDataView.supertype[T, V](_ => proto)
47-
target.viewAs[V]
48-
}
49-
}
50-
5140
/** Provides `viewAsSupertype` for subclasses of [[Record]] */
5241
implicit class RecordUpcastable[T <: Record](target: T) {
5342

core/src/main/scala/chisel3/experimental/hierarchy/core/Lookupable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ object Lookupable {
6161
)(
6262
implicit sourceInfo: SourceInfo
6363
): T = {
64-
internal.requireIsHardware(data, "cross module reference type")
64+
experimental.requireIsHardware(data, "cross module reference type")
6565
data._parent match {
6666
case None => data
6767
case Some(parent) =>

core/src/main/scala/chisel3/experimental/package.scala

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ package object experimental {
2121
implicit def fromDoubleToDoubleParam(x: Double): DoubleParam = DoubleParam(x)
2222
implicit def fromStringToStringParam(x: String): StringParam = StringParam(x)
2323

24-
@deprecated("This type has moved to chisel3", "Chisel 3.5")
25-
type ChiselEnum = chisel3.ChiselEnum
26-
@deprecated("This type has moved to chisel3", "Chisel 3.5")
27-
type EnumType = chisel3.EnumType
28-
@deprecated("This type has moved to chisel3", "Chisel 3.5")
29-
val suppressEnumCastWarning = chisel3.suppressEnumCastWarning
30-
3124
// Rocket Chip-style clonemodule
3225

3326
/** A record containing the results of CloneModuleAsRecord
@@ -488,7 +481,4 @@ package object experimental {
488481
"_10" -> _10
489482
)
490483
}
491-
492-
@deprecated("This value has moved to chisel3.reflect", "Chisel 3.6")
493-
val DataMirror = chisel3.reflect.DataMirror
494484
}

core/src/main/scala/chisel3/internal/Binding.scala

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@ import chisel3.properties.Class
99

1010
import scala.collection.immutable.VectorMap
1111

12-
@deprecated(deprecatedPublicAPIMsg + ". Use chisel3.experimental.requireIsHardware instead", "Chisel 3.6")
13-
object requireIsHardware {
14-
def apply(node: Data, msg: String = ""): Unit = chisel3.experimental.requireIsHardware.apply(node, msg)
15-
}
16-
17-
@deprecated(deprecatedPublicAPIMsg + ". Use chisel3.experimental.requireIsChiselType instead", "Chisel 3.6")
18-
object requireIsChiselType {
19-
def apply(node: Data, msg: String = ""): Unit = chisel3.experimental.requireIsChiselType.apply(node, msg)
20-
}
21-
2212
// Element only direction used for the Binding system only.
2313
private[chisel3] sealed abstract class BindingDirection
2414
private[chisel3] object BindingDirection {

core/src/main/scala/chisel3/internal/SourceInfo.scala

Lines changed: 0 additions & 58 deletions
This file was deleted.

core/src/main/scala/chisel3/internal/package.scala

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,6 @@ import scala.collection.mutable
1414

1515
package object internal {
1616

17-
@deprecated("This function has moved to chisel3.experimental", "Chisel 3.6")
18-
val prefix = chisel3.experimental.prefix
19-
@deprecated("This function has moved to chisel3.experimental", "Chisel 3.6")
20-
val noPrefix = chisel3.experimental.noPrefix
21-
22-
@deprecated("This type has moved to chisel3", "Chisel 3.6")
23-
type ChiselException = chisel3.ChiselException
24-
25-
@deprecated("This type has moved to chisel3", "Chisel 3.6")
26-
type InstanceId = chisel3.InstanceId
27-
2817
@implicitNotFound("You are trying to access a macro-only API. Please use the @public annotation instead.")
2918
trait MacroGenerated
3019

core/src/main/scala/chisel3/probe/Probe.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ package chisel3.probe
44

55
import chisel3._
66
import chisel3.Data.ProbeInfo
7-
import chisel3.experimental.SourceInfo
8-
import chisel3.internal.{containsProbe, requireIsChiselType, requireNoProbeTypeModifier, Builder}
7+
import chisel3.experimental.{requireIsChiselType, SourceInfo}
8+
import chisel3.internal.{containsProbe, requireNoProbeTypeModifier, Builder}
99

1010
import scala.language.experimental.macros
1111

core/src/main/scala/chisel3/probe/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import chisel3.internal._
77
import chisel3.internal.Builder.pushCommand
88
import chisel3.internal.firrtl.ir._
99
import chisel3.Data.ProbeInfo
10-
import chisel3.experimental.SourceInfo
10+
import chisel3.experimental.{requireIsHardware, SourceInfo}
1111
import chisel3.reflect.DataMirror.{checkTypeEquivalence, collectAllMembers, hasProbeTypeModifier}
1212

1313
import scala.language.experimental.macros

core/src/main/scala/chisel3/reflect/DataMirror.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package chisel3.reflect
55
import chisel3._
66
import chisel3.internal._
77
import chisel3.internal.firrtl.ir._
8-
import chisel3.experimental.{BaseModule, SourceInfo}
8+
import chisel3.experimental.{requireIsHardware, BaseModule, SourceInfo}
99
import scala.reflect.ClassTag
1010

1111
object DataMirror {

src/main/scala/chisel3/Driver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import firrtl.util.{BackendCompilationUtilities => FirrtlBackendCompilationUtili
88
import java.io._
99
import _root_.logger.LazyLogging
1010

11-
@deprecated("Use object firrtl.util.BackendCompilationUtilities instead", "Chisel 3.5")
12-
trait BackendCompilationUtilities extends LazyLogging {
11+
private[chisel3] trait BackendCompilationUtilities extends LazyLogging {
1312

1413
import scala.sys.process.{ProcessBuilder, ProcessLogger, _}
1514

src/main/scala/chisel3/util/MixedVec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package chisel3.util
44

55
import chisel3._
6-
import chisel3.internal.requireIsChiselType
6+
import chisel3.experimental.requireIsChiselType
77

88
import scala.collection.immutable.ListMap
99

src/main/scala/chisel3/util/Mux.scala

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,6 @@ object PriorityMux {
6161
*/
6262
object MuxLookup extends SourceInfoDoc {
6363

64-
/** Creates a cascade of n Muxs to search for a key value.
65-
*
66-
* @example {{{
67-
* MuxLookup(idx, default, Seq(0.U -> a, 1.U -> b))
68-
* }}}
69-
*
70-
* @param key a key to search for
71-
* @param default a default value if nothing is found
72-
* @param mapping a sequence to search of keys and values
73-
* @return the value found or the default if not
74-
*/
75-
@deprecated("Use MuxLookup(key, default)(mapping) instead", "Chisel 3.6")
76-
def apply[S <: UInt, T <: Data](key: S, default: T, mapping: Seq[(S, T)]): T =
77-
do_apply(key, default, mapping)
78-
7964
/** @param key a key to search for
8065
* @param default a default value if nothing is found
8166
* @param mapping a sequence to search of keys and values

0 commit comments

Comments
 (0)