From 0ccc0d4c50564316eae1e8b10fcc782a42516653 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Fri, 8 Jan 2010 13:20:17 +0000 Subject: Merged revisions 20416 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r20416 | cunei | 2010-01-08 14:14:47 +0100 (Fri, 08 Jan 2010) | 2 lines Reverting r20406 (dragos) ........ --- src/library/scala/Predef.scala | 4 ++-- src/library/scala/collection/immutable/StringOps.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 5684c91aaa..1b9f4b75ba 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -117,7 +117,7 @@ object Predef extends LowPriorityImplicits { throw new IllegalArgumentException("requirement failed: "+ message) } - final class Ensuring[A](val x: A) { + class Ensuring[A](x: A) { def ensuring(cond: Boolean): A = { assert(cond); x } def ensuring(cond: Boolean, msg: Any): A = { assert(cond, msg); x } def ensuring(cond: A => Boolean): A = { assert(cond(x)); x } @@ -139,7 +139,7 @@ object Predef extends LowPriorityImplicits { def unapply[A, B, C](x: Tuple3[A, B, C]): Option[Tuple3[A, B, C]] = Some(x) } - final class ArrowAssoc[A](val x: A) { + class ArrowAssoc[A](x: A) { @inline def -> [B](y: B): Tuple2[A, B] = Tuple2(x, y) def →[B](y: B): Tuple2[A, B] = ->(y) } diff --git a/src/library/scala/collection/immutable/StringOps.scala b/src/library/scala/collection/immutable/StringOps.scala index db6479742b..9138c2bbac 100644 --- a/src/library/scala/collection/immutable/StringOps.scala +++ b/src/library/scala/collection/immutable/StringOps.scala @@ -17,7 +17,7 @@ import mutable.StringBuilder /** * @since 2.8 */ -final class StringOps(override val repr: String) extends StringLike[String] { +class StringOps(override val repr: String) extends StringLike[String] { override protected[this] def thisCollection: WrappedString = new WrappedString(repr) override protected[this] def toCollection(repr: String): WrappedString = new WrappedString(repr) -- cgit v1.2.3