diff options
| -rw-r--r-- | src/library/scala/collection/mutable/FlatArray.scala | 6 | ||||
| -rw-r--r-- | src/library/scala/runtime/StringFormat.scala | 2 | ||||
| -rw-r--r-- | test/files/run/Meter.scala | 12 | ||||
| -rw-r--r-- | test/files/run/MeterCaseClass.scala | 12 | ||||
| -rw-r--r-- | test/files/run/existentials3.check | 28 | ||||
| -rw-r--r-- | test/files/run/t1195.check | 8 |
6 files changed, 34 insertions, 34 deletions
diff --git a/src/library/scala/collection/mutable/FlatArray.scala b/src/library/scala/collection/mutable/FlatArray.scala index 0650d09861..a7f994bf74 100644 --- a/src/library/scala/collection/mutable/FlatArray.scala +++ b/src/library/scala/collection/mutable/FlatArray.scala @@ -76,8 +76,8 @@ object FlatArray { new Bldr[Boxed, Unboxed](boxings, elemManifest) implicit def canBuildFrom[Boxed, Unboxed]( - implicit - boxings: BoxingConversions[Boxed, Unboxed], + implicit + boxings: BoxingConversions[Boxed, Unboxed], elemManifest: ClassManifest[Unboxed]): CanBuildFrom[FlatArray[_], Boxed, FlatArray[Boxed]] = new CanBuildFrom[FlatArray[_], Boxed, FlatArray[Boxed]] { def apply(from: FlatArray[_]): Builder[Boxed, FlatArray[Boxed]] = @@ -129,7 +129,7 @@ object FlatArray { } private class Impl[Boxed, Unboxed]( - elems: Array[Unboxed], + elems: Array[Unboxed], boxings: BoxingConversions[Boxed, Unboxed], elemManifest: ClassManifest[Unboxed]) extends FlatArray[Boxed] { diff --git a/src/library/scala/runtime/StringFormat.scala b/src/library/scala/runtime/StringFormat.scala index 1f0183afbb..c120cbb14d 100644 --- a/src/library/scala/runtime/StringFormat.scala +++ b/src/library/scala/runtime/StringFormat.scala @@ -10,7 +10,7 @@ package scala.runtime /** A wrapper class that adds a `formatted` operation to any value */ -final class StringFormat(val self: Any) { +final class StringFormat(val self: Any) { // Note: The implicit conversion from Any to StringFormat is one of two // implicit conversions from Any to AnyRef in Predef. It is important to have at least diff --git a/test/files/run/Meter.scala b/test/files/run/Meter.scala index 42a3aac5f8..515e46de24 100644 --- a/test/files/run/Meter.scala +++ b/test/files/run/Meter.scala @@ -1,6 +1,6 @@ package a { class Meter(val underlying: Double) extends AnyVal with _root_.b.Printable { - def + (other: Meter): Meter = + def + (other: Meter): Meter = new Meter(this.underlying + other.underlying) def / (other: Meter): Double = this.underlying / other.underlying def / (factor: Double): Meter = new Meter(this.underlying / factor) @@ -11,7 +11,7 @@ package a { } object Meter extends (Double => Meter) { - + def apply(x: Double): Meter = new Meter(x) implicit val boxings = new BoxingConversions[Meter, Double] { @@ -21,7 +21,7 @@ package a { } class Foot(val unbox: Double) extends AnyVal { - def + (other: Foot): Foot = + def + (other: Foot): Foot = new Foot(this.unbox + other.unbox) override def toString = unbox.toString+"ft" } @@ -34,8 +34,8 @@ package a { } package b { - trait Printable extends Any { - def print: Unit = Console.print(this) + trait Printable extends Any { + def print: Unit = Console.print(this) protected def proprint = Console.print("<<<") } } @@ -65,7 +65,7 @@ object Test extends App { println("x == 1: "+(x == 1)) println("x == y: "+(x == y)) assert(x.hashCode == (1.0).hashCode) - + val a: Any = x val b: Any = y println("a == b: "+(a == b)) diff --git a/test/files/run/MeterCaseClass.scala b/test/files/run/MeterCaseClass.scala index 4f082b5252..8459163f31 100644 --- a/test/files/run/MeterCaseClass.scala +++ b/test/files/run/MeterCaseClass.scala @@ -1,6 +1,6 @@ package a { case class Meter(underlying: Double) extends AnyVal with _root_.b.Printable { - def + (other: Meter): Meter = + def + (other: Meter): Meter = new Meter(this.underlying + other.underlying) def / (other: Meter): Double = this.underlying / other.underlying def / (factor: Double): Meter = new Meter(this.underlying / factor) @@ -10,7 +10,7 @@ package a { } object Meter extends (Double => Meter) { - + implicit val boxings = new BoxingConversions[Meter, Double] { def box(x: Double) = new Meter(x) def unbox(m: Meter) = m.underlying @@ -18,7 +18,7 @@ package a { } class Foot(val unbox: Double) extends AnyVal { - def + (other: Foot): Foot = + def + (other: Foot): Foot = new Foot(this.unbox + other.unbox) override def toString = unbox.toString+"ft" } @@ -31,8 +31,8 @@ package a { } package b { - trait Printable extends Any { - def print: Unit = Console.print(this) + trait Printable extends Any { + def print: Unit = Console.print(this) protected def proprint = Console.print("<<<") } } @@ -62,7 +62,7 @@ object Test extends App { println("x == 1: "+(x == 1)) println("x == y: "+(x == y)) assert(x.hashCode == (1.0).hashCode) - + val a: Any = x val b: Any = y println("a == b: "+(a == b)) diff --git a/test/files/run/existentials3.check b/test/files/run/existentials3.check index 8559540f80..36a458dacc 100644 --- a/test/files/run/existentials3.check +++ b/test/files/run/existentials3.check @@ -1,22 +1,22 @@ -_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object -_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object +_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object +_ <: Object with Test$ToS with scala.Product with scala.Serializable +Object with Test$ToS Object with Test$ToS -Object with Test$ToS with Object Object with Test$ToS scala.Function0[Object with Test$ToS] scala.Function0[Object with Test$ToS] -_ <: Object with _ <: Object with Object with Test$ToS with Object with Object -_ <: Object with _ <: Object with _ <: Object with Test$ToS with Object with Object -scala.collection.immutable.List[Object with scala.collection.Seq[Int] with Object] -scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int] with Object] -_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object -_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object +_ <: Object with _ <: Object with Object with Test$ToS +_ <: Object with _ <: Object with _ <: Object with Test$ToS +scala.collection.immutable.List[Object with scala.collection.Seq[Int]] +scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int]] +_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object +_ <: Object with Test$ToS with scala.Product with scala.Serializable +Object with Test$ToS Object with Test$ToS -Object with Test$ToS with Object Object with Test$ToS scala.Function0[Object with Test$ToS] scala.Function0[Object with Test$ToS] -_ <: Object with _ <: Object with Object with Test$ToS with Object with Object -_ <: Object with _ <: Object with _ <: Object with Test$ToS with Object with Object -scala.collection.immutable.List[Object with scala.collection.Seq[Int] with Object] -scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int] with Object] +_ <: Object with _ <: Object with Object with Test$ToS +_ <: Object with _ <: Object with _ <: Object with Test$ToS +scala.collection.immutable.List[Object with scala.collection.Seq[Int]] +scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int]] diff --git a/test/files/run/t1195.check b/test/files/run/t1195.check index 1214d0c4b5..d023bc91f7 100644 --- a/test/files/run/t1195.check +++ b/test/files/run/t1195.check @@ -1,6 +1,6 @@ -_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object -_ <: Object with scala.Product with scala.Serializable with Object +_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object +_ <: Object with scala.Product with scala.Serializable Object with scala.Product with scala.Serializable -_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object -_ <: Object with scala.Product with scala.Serializable with Object +_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object +_ <: Object with scala.Product with scala.Serializable Object with scala.Product with scala.Serializable |