Merge branch 'master' into 3.5-release

1 files changed, 31 insertions, 29 deletions

diff --git a/src/test/scala/chiselTests/Math.scala b/src/test/scala/chiselTests/Math.scala
index 9091b0b4..42eff6ad 100644
--- a/src/test/scala/chiselTests/Math.scala
+++ b/src/test/scala/chiselTests/Math.scala
@@ -10,41 +10,43 @@ class Math extends ChiselPropSpec {
   implicit val noShrinkListVal = Shrink[List[Int]](_ => Stream.empty)
   implicit val noShrinkInt = Shrink[Int](_ => Stream.empty)
 
-  property ("unsignedBitLength is computed correctly") {
-    forAll(safeUIntWidth) { case (width: Int) =>
-      for ( offset <- List(-1, 0, 1)) {
-        val n = (1 << width) + offset
-        if (n >= 0) {
-          val d = unsignedBitLength(n)
-          val t = if (n == 0) 0 else if (offset < 0) width else width + 1
-          d shouldEqual (t)
+  property("unsignedBitLength is computed correctly") {
+    forAll(safeUIntWidth) {
+      case (width: Int) =>
+        for (offset <- List(-1, 0, 1)) {
+          val n = (1 << width) + offset
+          if (n >= 0) {
+            val d = unsignedBitLength(n)
+            val t = if (n == 0) 0 else if (offset < 0) width else width + 1
+            d shouldEqual (t)
+          }
         }
-      }
     }
   }
 
-  property ("signedBitLength is computed correctly") {
-    forAll(safeUIntWidth) { case (width: Int) =>
-      for ( offset <- List(-1, 0, 1)) {
-        for ( mult <- List(-1, +1)) {
-          val n = ((1 << (width - 1)) + offset) * mult
-          val d = signedBitLength(n)
-          val t = n match {
-            case -2 => 2
-            case -1 => 1
-            case 0 => 0
-            case 1 => 2
-            case 2 => 3
-            case _ =>
-              if (n > 0) {
-                if (offset < 0) width else width + 1
-              } else {
-                if (offset > 0) width + 1 else width
-              }
+  property("signedBitLength is computed correctly") {
+    forAll(safeUIntWidth) {
+      case (width: Int) =>
+        for (offset <- List(-1, 0, 1)) {
+          for (mult <- List(-1, +1)) {
+            val n = ((1 << (width - 1)) + offset) * mult
+            val d = signedBitLength(n)
+            val t = n match {
+              case -2 => 2
+              case -1 => 1
+              case 0  => 0
+              case 1  => 2
+              case 2  => 3
+              case _ =>
+                if (n > 0) {
+                  if (offset < 0) width else width + 1
+                } else {
+                  if (offset > 0) width + 1 else width
+                }
+            }
+            d shouldEqual (t)
           }
-          d shouldEqual (t)
         }
-      }
     }
   }
 }