From 09958f63470697188e1ed1a01c7ea39b8c56e7ef Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Tue, 26 Apr 2016 11:06:16 -0700
Subject: Scalastyle fixes and "ignores". - No functional changes.

---
 src/main/scala/Chisel/internal/Builder.scala   | 6 +++---
 src/main/scala/Chisel/internal/firrtl/IR.scala | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/main/scala/Chisel/internal')

diff --git a/src/main/scala/Chisel/internal/Builder.scala b/src/main/scala/Chisel/internal/Builder.scala
index 73dd5906..f9d27a61 100644
--- a/src/main/scala/Chisel/internal/Builder.scala
+++ b/src/main/scala/Chisel/internal/Builder.scala
@@ -41,13 +41,13 @@ private[Chisel] class IdGen {
 }
 
 private[Chisel] trait HasId {
-  private[Chisel] def _onModuleClose {}
+  private[Chisel] def _onModuleClose {} // scalastyle:ignore method.name
   private[Chisel] val _parent = Builder.dynamicContext.currentModule
   _parent.foreach(_.addId(this))
 
   private[Chisel] val _id = Builder.idGen.next
-  override def hashCode = _id.toInt
-  override def equals(that: Any) = that match {
+  override def hashCode: Int = _id.toInt
+  override def equals(that: Any): Boolean = that match {
     case x: HasId => _id == x._id
     case _ => false
   }
diff --git a/src/main/scala/Chisel/internal/firrtl/IR.scala b/src/main/scala/Chisel/internal/firrtl/IR.scala
index 4c039e9a..1e06a663 100644
--- a/src/main/scala/Chisel/internal/firrtl/IR.scala
+++ b/src/main/scala/Chisel/internal/firrtl/IR.scala
@@ -169,9 +169,11 @@ case class Printf(clk: Arg, formatIn: String, ids: Seq[Arg]) extends Command {
   def format: String = {
     def escaped(x: Char) = {
       require(x.toInt >= 0)
-      if (x == '"' || x == '\\') s"\\${x}"
-      else if (x == '\n') "\\n"
-      else {
+      if (x == '"' || x == '\\') {
+        s"\\${x}"
+      } else if (x == '\n') {
+        "\\n"
+      } else {
         require(x.toInt >= 32) // TODO \xNN once FIRRTL issue #59 is resolved
         x
       }
-- 
cgit v1.2.3