diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-01 11:54:45 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-01 11:54:45 -0700 |
commit | c1451cfca63764bc4096cd87168954db2be3da05 (patch) | |
tree | aae080c86eaaaa09f10b6a968b11052aafdd2832 /src/reflect | |
parent | 5f60f27ab34f59253b7af5251250388ca606019b (diff) | |
parent | b86d29eda5166c6e8033215a1615fdab33a5de40 (diff) | |
download | scala-c1451cfca63764bc4096cd87168954db2be3da05.tar.gz scala-c1451cfca63764bc4096cd87168954db2be3da05.tar.bz2 scala-c1451cfca63764bc4096cd87168954db2be3da05.zip |
Merge pull request #2693 from lexspoon/semmle-lint
Lint-like fixes found by Semmle
Diffstat (limited to 'src/reflect')
-rw-r--r-- | src/reflect/scala/reflect/internal/AnnotationInfos.scala | 2 | ||||
-rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 2 | ||||
-rw-r--r-- | src/reflect/scala/reflect/internal/util/Statistics.scala | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/AnnotationInfos.scala b/src/reflect/scala/reflect/internal/AnnotationInfos.scala index 73ca74f08e..215ab6abd6 100644 --- a/src/reflect/scala/reflect/internal/AnnotationInfos.scala +++ b/src/reflect/scala/reflect/internal/AnnotationInfos.scala @@ -73,7 +73,7 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable => * - arrays of constants * - or nested classfile annotations */ - abstract class ClassfileAnnotArg extends Product + sealed abstract class ClassfileAnnotArg extends Product implicit val JavaArgumentTag = ClassTag[ClassfileAnnotArg](classOf[ClassfileAnnotArg]) case object UnmappableAnnotArg extends ClassfileAnnotArg diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index c3596fe62e..424296c212 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -3433,7 +3433,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => } /** A class for type histories */ - private sealed case class TypeHistory(var validFrom: Period, info: Type, prev: TypeHistory) { + private case class TypeHistory(var validFrom: Period, info: Type, prev: TypeHistory) { assert((prev eq null) || phaseId(validFrom) > phaseId(prev.validFrom), this) assert(validFrom != NoPeriod, this) diff --git a/src/reflect/scala/reflect/internal/util/Statistics.scala b/src/reflect/scala/reflect/internal/util/Statistics.scala index b583137059..905f1bf26e 100644 --- a/src/reflect/scala/reflect/internal/util/Statistics.scala +++ b/src/reflect/scala/reflect/internal/util/Statistics.scala @@ -133,6 +133,12 @@ quant) if (this.value < that.value) -1 else if (this.value > that.value) 1 else 0 + override def equals(that: Any): Boolean = + that match { + case that: Counter => (this compare that) == 0 + case _ => false + } + override def hashCode = value override def toString = value.toString } @@ -184,6 +190,12 @@ quant) if (this.specificNanos < that.specificNanos) -1 else if (this.specificNanos > that.specificNanos) 1 else 0 + override def equals(that: Any): Boolean = + that match { + case that: StackableTimer => (this compare that) == 0 + case _ => false + } + override def hashCode = specificNanos.## override def toString = s"${super.toString} aggregate, ${show(specificNanos)} specific" } |