Merge branch 'master' into 3.4.x

chipsalliance · Sep 22, 2020 · 0a77486 · 0a77486
2 parents cea53d0 + 9c4f14f
commit 0a77486
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/src/wiki-deprecated/cookbook.md b/docs/src/wiki-deprecated/cookbook.md
@@ -128,7 +128,7 @@ State transitions are then handled with [`switch`](https://www.chisel-lang.org/a
 
 ```scala mdoc:silent:reset
 import chisel3._
-import chisel3.util._
+import chisel3.util.{switch, is}
 import chisel3.experimental.ChiselEnum
 
 object DetectTwoOnes {

diff --git a/src/main/scala/chisel3/util/Conditional.scala b/src/main/scala/chisel3/util/Conditional.scala
@@ -94,7 +94,7 @@ object switch {
   def apply[T <: Element](cond: T)(x: => Any): Unit = macro impl
   def impl(c: Context)(cond: c.Tree)(x: c.Tree): c.Tree = { import c.universe._
     val q"..$body" = x
-    val res = body.foldLeft(q"""new SwitchContext($cond, None, Set.empty)""") {
+    val res = body.foldLeft(q"""new chisel3.util.SwitchContext($cond, None, Set.empty)""") {
       case (acc, tree) => tree match {
         // TODO: remove when Chisel compatibility package is removed
         case q"Chisel.`package`.is.apply( ..$params )( ..$body )" => q"$acc.is( ..$params )( ..$body )"

diff --git a/src/test/scala/chiselTests/SwitchSpec.scala b/src/test/scala/chiselTests/SwitchSpec.scala
@@ -4,7 +4,7 @@ package chiselTests
 
 import chisel3._
 import chisel3.stage.ChiselStage
-import chisel3.util._
+import chisel3.util.{switch, is}
 
 class SwitchSpec extends ChiselFlatSpec with Utils {
   "switch" should "require literal conditions" in {