summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Lawson2016-08-30 13:45:37 -0700
committerJim Lawson2016-08-30 13:45:37 -0700
commit8002f7ac6731b1da5e0d8e7b1536995a23878037 (patch)
tree3fd6212e57ffbdc7441b68794f89879b9eaff45b
parent000bba093609b74d0dbbc73490edac9ed756aa65 (diff)
Make compileOptions in the Chisel package effective.
Remove references to the Chisel package in favor of explicit chisel3 imports in tests,
-rw-r--r--src/main/scala/chisel3/compatibility.scala2
-rw-r--r--src/test/scala/chiselTests/BetterNamingTests.scala3
-rw-r--r--src/test/scala/chiselTests/IOCompatibility.scala2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/main/scala/chisel3/compatibility.scala b/src/main/scala/chisel3/compatibility.scala
index 8524ea2a..85311ba2 100644
--- a/src/main/scala/chisel3/compatibility.scala
+++ b/src/main/scala/chisel3/compatibility.scala
@@ -4,7 +4,7 @@
// moving to the more standard package naming convention chisel3 (lowercase c).
package object Chisel { // scalastyle:ignore package.object.name
- import chisel3.NotStrict.CompileOptions
+ implicit val compileOptions = chisel3.NotStrict.CompileOptions
type Direction = chisel3.core.Direction
val INPUT = chisel3.core.Direction.Input
val OUTPUT = chisel3.core.Direction.Output
diff --git a/src/test/scala/chiselTests/BetterNamingTests.scala b/src/test/scala/chiselTests/BetterNamingTests.scala
index a480da98..98ca0306 100644
--- a/src/test/scala/chiselTests/BetterNamingTests.scala
+++ b/src/test/scala/chiselTests/BetterNamingTests.scala
@@ -3,7 +3,8 @@ package chiselTests
import org.scalatest.{FlatSpec, Matchers}
import collection.mutable
-import Chisel._
+import chisel3._
+import chisel3.util._
import chisel3.NotStrict.CompileOptions
diff --git a/src/test/scala/chiselTests/IOCompatibility.scala b/src/test/scala/chiselTests/IOCompatibility.scala
index aa3bd962..d100df2b 100644
--- a/src/test/scala/chiselTests/IOCompatibility.scala
+++ b/src/test/scala/chiselTests/IOCompatibility.scala
@@ -2,7 +2,7 @@
package chiselTests
-import Chisel._
+import chisel3._
import chisel3.NotStrict.CompileOptions
class IOCSimpleIO extends Bundle {