diff options
| author | Jack Koenig | 2021-01-19 20:19:08 -0800 |
|---|---|---|
| committer | GitHub | 2021-01-20 04:19:08 +0000 |
| commit | 031fe1382660867750e6eeebea5665c137dbccbe (patch) | |
| tree | cc65ca17a57fe093a73a5c25059f42cd22332a76 /src/main/scala/firrtl/annotations | |
| parent | 698a9dca52f819aca6309e3b03f2420a71bc89a6 (diff) | |
Cleanup some warnings (#2032)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/scala/firrtl/annotations')
| -rw-r--r-- | src/main/scala/firrtl/annotations/Annotation.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/firrtl/annotations/Target.scala | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/scala/firrtl/annotations/Annotation.scala b/src/main/scala/firrtl/annotations/Annotation.scala index 5f792127..b5c9c7e0 100644 --- a/src/main/scala/firrtl/annotations/Annotation.scala +++ b/src/main/scala/firrtl/annotations/Annotation.scala @@ -71,7 +71,7 @@ trait SingleTargetAnnotation[T <: Named] extends Annotation { case c: CircuitTarget => c.toNamed case other => throw Target.NamedException(s"Cannot convert $other to [[Named]]") } - Target.convertTarget2Named(result) match { + (Target.convertTarget2Named(result): @unchecked) match { case newTarget: T @unchecked => try { duplicate(newTarget) diff --git a/src/main/scala/firrtl/annotations/Target.scala b/src/main/scala/firrtl/annotations/Target.scala index 8e84a269..92339946 100644 --- a/src/main/scala/firrtl/annotations/Target.scala +++ b/src/main/scala/firrtl/annotations/Target.scala @@ -265,7 +265,7 @@ case class GenericTarget(circuitOpt: Option[String], moduleOpt: Option[String], case GenericTarget(Some(c), Some(m), Instance(i) +: OfModule(o) +: Vector()) => InstanceTarget(c, m, Nil, i, o) case GenericTarget(Some(c), Some(m), component) => val path = getPath.getOrElse(Nil) - (getRef, getInstanceOf) match { + ((getRef, getInstanceOf): @unchecked) match { case (Some((r, comps)), _) => ReferenceTarget(c, m, path, r, comps) case (None, Some((i, o))) => InstanceTarget(c, m, path, i, o) } @@ -516,6 +516,7 @@ trait IsComponent extends IsMember { case ("", Ref(name)) => name case (string, Field(value)) => s"$string.$value" case (string, Index(value)) => s"$string[$value]" + case (_, token) => Utils.error(s"Unexpected token: $token") } ComponentName(name, mn) case Seq(Instance(name), OfModule(o)) => ComponentName(name, mn) @@ -660,6 +661,7 @@ case class ReferenceTarget( case Index(idx) => sub_type(baseType) case Field(field) => field_type(baseType, field) case _: Ref => baseType + case token => Utils.error(s"Unexpected token $token") } componentType(headType, tokens.tail) } |