Merge branch 'master' into sdtwigg_connectwrap_renamechisel3

3 files changed, 1 insertions, 14 deletions

diff --git a/src/main/scala/chisel3/compatibility.scala b/src/main/scala/chisel3/compatibility.scala
index d4ad7b9f..5624b79c 100644
--- a/src/main/scala/chisel3/compatibility.scala
+++ b/src/main/scala/chisel3/compatibility.scala
@@ -100,7 +100,6 @@ package object Chisel {
 
   type BackendCompilationUtilities = chisel3.BackendCompilationUtilities
   val Driver = chisel3.Driver
-  type FileSystemUtilities = chisel3.compatibility.FileSystemUtilities
   val ImplicitConversions = chisel3.util.ImplicitConversions
   val chiselMain = chisel3.compatibility.chiselMain
   val throwException = chisel3.compatibility.throwException
diff --git a/src/main/scala/chisel3/compatibility/FileSystemUtilities.scala b/src/main/scala/chisel3/compatibility/FileSystemUtilities.scala
deleted file mode 100644
index cd47c731..00000000
--- a/src/main/scala/chisel3/compatibility/FileSystemUtilities.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-// See LICENSE for license details.
-
-package chisel3.compatibility
-
-import chisel3._
-
-@deprecated("FileSystemUtilities doesn't exist in chisel3", "3.0.0")
-trait FileSystemUtilities {
-  def createOutputFile(name: String): java.io.FileWriter  = {
-    new java.io.FileWriter(Driver.targetDir + "/" + name)
-  }
-}
diff --git a/src/main/scala/chisel3/util/OneHot.scala b/src/main/scala/chisel3/util/OneHot.scala
index abede61e..7e04a8d7 100644
--- a/src/main/scala/chisel3/util/OneHot.scala
+++ b/src/main/scala/chisel3/util/OneHot.scala
@@ -11,7 +11,7 @@ import chisel3._
   * This is the inverse of [[Chisel.UIntToOH UIntToOH]]*/
 object OHToUInt {
   def apply(in: Seq[Bool]): UInt = apply(Cat(in.reverse), in.size)
-  def apply(in: Vec[Bool]): UInt = apply(in.toBits, in.size)
+  def apply(in: Vec[Bool]): UInt = apply(in.asUInt, in.size)
   def apply(in: Bits): UInt = apply(in, in.getWidth)
 
   def apply(in: Bits, width: Int): UInt = {