diff options
7 files changed, 15 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/ant/sabbus/Settings.scala b/src/compiler/scala/tools/ant/sabbus/Settings.scala index 134b3a4bb9..2719196095 100644 --- a/src/compiler/scala/tools/ant/sabbus/Settings.scala +++ b/src/compiler/scala/tools/ant/sabbus/Settings.scala @@ -14,7 +14,6 @@ import java.io.File import org.apache.tools.ant.types.{Path, Reference} -@cloneable class Settings { private var gBf: Option[String] = None diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index a89f4f01c3..91fd7dbdc8 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -427,7 +427,10 @@ self => t => val dd = DocDef(doc, t) val pos = doc.pos.withEnd(t.pos.endOrPoint) - dd setPos (if (t eq main) pos else pos.makeTransparent) + dd setPos ( + if (main exists (_ eq t)) pos + else pos.makeTransparent + ) } } else trees diff --git a/src/compiler/scala/tools/nsc/matching/MatrixAdditions.scala b/src/compiler/scala/tools/nsc/matching/MatrixAdditions.scala index c5f09cd8de..4f13d4fd99 100644 --- a/src/compiler/scala/tools/nsc/matching/MatrixAdditions.scala +++ b/src/compiler/scala/tools/nsc/matching/MatrixAdditions.scala @@ -115,7 +115,7 @@ trait MatrixAdditions extends ast.TreeDSL object lxtt extends Transformer { override def transform(tree: Tree): Tree = tree match { case blck @ Block(vdefs, ld @ LabelDef(name, params, body)) => - def shouldInline(t: FinalState) = t.isReachedOnce && (t.label eq ld.symbol) + def shouldInline(t: FinalState) = t.isReachedOnce && (t.labelSym eq ld.symbol) if (targets exists shouldInline) squeezedBlock(vdefs, body) else blck diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 0727835e00..6937658534 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -739,8 +739,9 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { override def mapOver(tp: Type): Type = tp match { case ClassInfoType(parents, decls, clazz) => val parents1 = parents mapConserve (this); - val decls1 = mapOver(decls.toList); - if ((parents1 eq parents) && (decls1 eq decls)) tp + val declsList = decls.toList + val decls1 = mapOver(declsList); + if ((parents1 eq parents) && (decls1 eq declsList)) tp else ClassInfoType(parents1, new Scope(decls1), clazz) case AnnotatedType(annots, atp, selfsym) => val annots1 = mapOverAnnotations(annots) @@ -1254,7 +1255,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { for (tp <- owner.info.memberType(target).typeParams) yield if (!env.isDefinedAt(tp)) - typeRef(NoPrefix, from.info.typeParams.find(_ == tp.name).get, Nil) + typeRef(NoPrefix, from.info.typeParams.find(_.name == tp.name).get, Nil) else if ((env(tp) <:< tp.info.bounds.hi) && (tp.info.bounds.lo <:< env(tp))) env(tp) else tp.info.bounds.hi diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala index 422559f089..0e73bf7fad 100644 --- a/src/library/scala/collection/mutable/FlatHashTable.scala +++ b/src/library/scala/collection/mutable/FlatHashTable.scala @@ -184,7 +184,7 @@ trait FlatHashTable[A] { private def checkConsistent() { for (i <- 0 until table.length) if (table(i) != null && !containsEntry(table(i).asInstanceOf[A])) - assert(false, i+" "+table(i)+" "+table.toString) + assert(false, i+" "+table(i)+" "+table.mkString) } protected def elemHashCode(elem: A) = if (elem == null) 0 else elem.hashCode() diff --git a/src/library/scala/math/BigDecimal.scala b/src/library/scala/math/BigDecimal.scala index 2f3c7f131b..6bd6b33484 100644 --- a/src/library/scala/math/BigDecimal.scala +++ b/src/library/scala/math/BigDecimal.scala @@ -100,7 +100,7 @@ object BigDecimal */ def apply(x: Array[Char]): BigDecimal = apply(x, defaultMathContext) def apply(x: Array[Char], mc: MathContext): BigDecimal = - new BigDecimal(new BigDec(x.toString, mc), mc) + new BigDecimal(new BigDec(x.mkString, mc), mc) /** Translates the decimal String representation of a <code>BigDecimal</code> * into a <code>BigDecimal</code>. diff --git a/src/library/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala index 78c0ee9475..1cfe9c79c9 100644 --- a/src/library/scala/xml/Utility.scala +++ b/src/library/scala/xml/Utility.scala @@ -289,9 +289,10 @@ object Utility extends AnyRef with parsing.TokenTests */ def getName(s: String, index: Int): String = { if (index >= s.length) null - else (s drop index) match { - case Seq(x, xs @ _*) if isNameStart(x) => x.toString + (xs takeWhile isNameChar).mkString - case _ => "" + else { + val xs = s drop index + if (xs.nonEmpty && isNameStart(xs.head)) xs takeWhile isNameChar + else "" } } |