From 2c449c5d6e23dcbb60e8c64cab6b6f4ba6ae313f Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 18 Mar 2019 12:17:33 -0700
Subject: Split #974 into two PRs - scalastyle updates (#1037)

* Update style warnings now that subprojects are aggregated.
Use "scalastyle-test-config.xml" for scalastyle config in tests.
Enable "_" in method names and accept method names ending in "_=".
Re-sync scalastyle-test-config.xml with scalastyle-config.xml

* Remove bogus tests that crept in with git add

* Add missing import.
---
 chiselFrontend/src/main/scala/chisel3/core/Bits.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'chiselFrontend/src/main/scala/chisel3/core/Bits.scala')

diff --git a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
index db2562a5..7270d92b 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
@@ -12,7 +12,7 @@ import chisel3.internal.sourceinfo.{SourceInfo, DeprecatedSourceInfo, SourceInfo
   UIntTransform}
 import chisel3.internal.firrtl.PrimOp._
 
-//scalastyle:off method.name
+// scalastyle:off method.name line.size.limit file.size.limit
 
 /** Element is a leaf data type: it cannot contain other [[Data]] objects. Example uses are for representing primitive
   * data types, like integers and bits.
@@ -1761,7 +1761,7 @@ final class Analog private (private[chisel3] val width: Width) extends Element {
   private[core] override def typeEquivalent(that: Data): Boolean =
     that.isInstanceOf[Analog] && this.width == that.width
 
-  override def litOption = None
+  override def litOption: Option[BigInt] = None
 
   def cloneType: this.type = new Analog(width).asInstanceOf[this.type]
 
-- 
cgit v1.2.3