Skip to content

Commit c58b6a8

Browse files
paulppaulp
committed
Whitespace and a couple checkfile updates.
1 parent 3fd4b1e commit c58b6a8

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎src/library/scala/collection/mutable/FlatArray.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ object FlatArray {
7676
new Bldr[Boxed, Unboxed](boxings, elemManifest)
7777

7878
implicit def canBuildFrom[Boxed, Unboxed](
79-
implicit
80-
boxings: BoxingConversions[Boxed, Unboxed],
79+
implicit
80+
boxings: BoxingConversions[Boxed, Unboxed],
8181
elemManifest: ClassManifest[Unboxed]): CanBuildFrom[FlatArray[_], Boxed, FlatArray[Boxed]] =
8282
new CanBuildFrom[FlatArray[_], Boxed, FlatArray[Boxed]] {
8383
def apply(from: FlatArray[_]): Builder[Boxed, FlatArray[Boxed]] =
@@ -129,7 +129,7 @@ object FlatArray {
129129
}
130130

131131
private class Impl[Boxed, Unboxed](
132-
elems: Array[Unboxed],
132+
elems: Array[Unboxed],
133133
boxings: BoxingConversions[Boxed, Unboxed],
134134
elemManifest: ClassManifest[Unboxed]) extends FlatArray[Boxed] {
135135

‎src/library/scala/runtime/StringFormat.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package scala.runtime
1010

1111
/** A wrapper class that adds a `formatted` operation to any value
1212
*/
13-
final class StringFormat(val self: Any) {
13+
final class StringFormat(val self: Any) {
1414

1515
// Note: The implicit conversion from Any to StringFormat is one of two
1616
// implicit conversions from Any to AnyRef in Predef. It is important to have at least

‎test/files/run/Meter.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package a {
22
class Meter(val underlying: Double) extends AnyVal with _root_.b.Printable {
3-
def + (other: Meter): Meter =
3+
def + (other: Meter): Meter =
44
new Meter(this.underlying + other.underlying)
55
def / (other: Meter): Double = this.underlying / other.underlying
66
def / (factor: Double): Meter = new Meter(this.underlying / factor)
@@ -11,7 +11,7 @@ package a {
1111
}
1212

1313
object Meter extends (Double => Meter) {
14-
14+
1515
def apply(x: Double): Meter = new Meter(x)
1616

1717
implicit val boxings = new BoxingConversions[Meter, Double] {
@@ -21,7 +21,7 @@ package a {
2121
}
2222

2323
class Foot(val unbox: Double) extends AnyVal {
24-
def + (other: Foot): Foot =
24+
def + (other: Foot): Foot =
2525
new Foot(this.unbox + other.unbox)
2626
override def toString = unbox.toString+"ft"
2727
}
@@ -34,8 +34,8 @@ package a {
3434

3535
}
3636
package b {
37-
trait Printable extends Any {
38-
def print: Unit = Console.print(this)
37+
trait Printable extends Any {
38+
def print: Unit = Console.print(this)
3939
protected def proprint = Console.print("<<<")
4040
}
4141
}
@@ -65,7 +65,7 @@ object Test extends App {
6565
println("x == 1: "+(x == 1))
6666
println("x == y: "+(x == y))
6767
assert(x.hashCode == (1.0).hashCode)
68-
68+
6969
val a: Any = x
7070
val b: Any = y
7171
println("a == b: "+(a == b))

‎test/files/run/MeterCaseClass.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package a {
22
case class Meter(underlying: Double) extends AnyVal with _root_.b.Printable {
3-
def + (other: Meter): Meter =
3+
def + (other: Meter): Meter =
44
new Meter(this.underlying + other.underlying)
55
def / (other: Meter): Double = this.underlying / other.underlying
66
def / (factor: Double): Meter = new Meter(this.underlying / factor)
@@ -10,15 +10,15 @@ package a {
1010
}
1111

1212
object Meter extends (Double => Meter) {
13-
13+
1414
implicit val boxings = new BoxingConversions[Meter, Double] {
1515
def box(x: Double) = new Meter(x)
1616
def unbox(m: Meter) = m.underlying
1717
}
1818
}
1919

2020
class Foot(val unbox: Double) extends AnyVal {
21-
def + (other: Foot): Foot =
21+
def + (other: Foot): Foot =
2222
new Foot(this.unbox + other.unbox)
2323
override def toString = unbox.toString+"ft"
2424
}
@@ -31,8 +31,8 @@ package a {
3131

3232
}
3333
package b {
34-
trait Printable extends Any {
35-
def print: Unit = Console.print(this)
34+
trait Printable extends Any {
35+
def print: Unit = Console.print(this)
3636
protected def proprint = Console.print("<<<")
3737
}
3838
}
@@ -62,7 +62,7 @@ object Test extends App {
6262
println("x == 1: "+(x == 1))
6363
println("x == y: "+(x == y))
6464
assert(x.hashCode == (1.0).hashCode)
65-
65+
6666
val a: Any = x
6767
val b: Any = y
6868
println("a == b: "+(a == b))

‎test/files/run/existentials3.check‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object
2-
_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object
1+
_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object
2+
_ <: Object with Test$ToS with scala.Product with scala.Serializable
3+
Object with Test$ToS
34
Object with Test$ToS
4-
Object with Test$ToS with Object
55
Object with Test$ToS
66
scala.Function0[Object with Test$ToS]
77
scala.Function0[Object with Test$ToS]
8-
_ <: Object with _ <: Object with Object with Test$ToS with Object with Object
9-
_ <: Object with _ <: Object with _ <: Object with Test$ToS with Object with Object
10-
scala.collection.immutable.List[Object with scala.collection.Seq[Int] with Object]
11-
scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int] with Object]
12-
_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object
13-
_ <: Object with Test$ToS with scala.Product with scala.Serializable with Object
8+
_ <: Object with _ <: Object with Object with Test$ToS
9+
_ <: Object with _ <: Object with _ <: Object with Test$ToS
10+
scala.collection.immutable.List[Object with scala.collection.Seq[Int]]
11+
scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int]]
12+
_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object
13+
_ <: Object with Test$ToS with scala.Product with scala.Serializable
14+
Object with Test$ToS
1415
Object with Test$ToS
15-
Object with Test$ToS with Object
1616
Object with Test$ToS
1717
scala.Function0[Object with Test$ToS]
1818
scala.Function0[Object with Test$ToS]
19-
_ <: Object with _ <: Object with Object with Test$ToS with Object with Object
20-
_ <: Object with _ <: Object with _ <: Object with Test$ToS with Object with Object
21-
scala.collection.immutable.List[Object with scala.collection.Seq[Int] with Object]
22-
scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int] with Object]
19+
_ <: Object with _ <: Object with Object with Test$ToS
20+
_ <: Object with _ <: Object with _ <: Object with Test$ToS
21+
scala.collection.immutable.List[Object with scala.collection.Seq[Int]]
22+
scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int]]

‎test/files/run/t1195.check‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object
2-
_ <: Object with scala.Product with scala.Serializable with Object
1+
_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object
2+
_ <: Object with scala.Product with scala.Serializable
33
Object with scala.Product with scala.Serializable
4-
_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object
5-
_ <: Object with scala.Product with scala.Serializable with Object
4+
_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object
5+
_ <: Object with scala.Product with scala.Serializable
66
Object with scala.Product with scala.Serializable

0 commit comments

Comments
 (0)