Skip to content

Commit 8910985

Browse files
authored
Merge pull request scala/scala#6586 from ashawley/2.12/clean-scaladoc-version
Drop old @Version refs in docs
2 parents f2f51e3 + 08914ab commit 8910985

File tree

156 files changed

+20
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+20
-180
lines changed

library/src/scala/App.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import scala.collection.mutable.ListBuffer
3434
* Future versions of this trait will no longer extend `DelayedInit`.
3535
*
3636
* @author Martin Odersky
37-
* @version 2.1, 15/02/2011
37+
* @since 2.1
3838
*/
3939
trait App extends DelayedInit {
4040

library/src/scala/Array.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class FallbackArrayBuilding {
4444
* `Array(1, 2)`, `Array(0, 0)` and `Array(1, 2, 0, 0)`.
4545
*
4646
* @author Martin Odersky
47-
* @version 1.0
47+
* @since 1.0
4848
*/
4949
object Array extends FallbackArrayBuilding {
5050
val emptyBooleanArray = new Array[Boolean](0)
@@ -481,7 +481,7 @@ object Array extends FallbackArrayBuilding {
481481
* `WrappedArray`.
482482
*
483483
* @author Martin Odersky
484-
* @version 1.0
484+
* @since 1.0
485485
* @see [[http://www.scala-lang.org/files/archive/spec/2.11/ Scala Language Specification]], for in-depth information on the transformations the Scala compiler makes on Arrays (Sections 6.6 and 6.15 respectively.)
486486
* @see [[http://docs.scala-lang.org/sips/completed/scala-2-8-arrays.html "Scala 2.8 Arrays"]] the Scala Improvement Document detailing arrays since Scala 2.8.
487487
* @see [[http://docs.scala-lang.org/overviews/collections/arrays.html "The Scala 2.8 Collections' API"]] section on `Array` by Martin Odersky for more information.

library/src/scala/Console.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ import scala.util.DynamicVariable
106106
* </table>
107107
*
108108
* @author Matthias Zenger
109-
* @version 1.0, 03/09/2003
109+
* @since 1.0
110110
*
111111
* @groupname console-output Console Output
112112
* @groupprio console-output 30

library/src/scala/Function.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ package scala
1313
/** A module defining utility methods for higher-order functional programming.
1414
*
1515
* @author Martin Odersky
16-
* @version 1.0, 29/11/2006
16+
* @since 1.0
1717
*/
1818
object Function {
1919
/** Given a sequence of functions `f,,1,,`, ..., `f,,n,,`, return the

library/src/scala/MatchError.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package scala
1616
*
1717
* @author Matthias Zenger
1818
* @author Martin Odersky
19-
* @version 1.1, 05/03/2004
2019
* @since 2.0
2120
*/
2221
final class MatchError(@transient obj: Any) extends RuntimeException {

library/src/scala/Option.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ object Option {
7676
*
7777
* @author Martin Odersky
7878
* @author Matthias Zenger
79-
* @version 1.1, 16/01/2007
79+
* @since 1.1
8080
* @define none `None`
8181
* @define some [[scala.Some]]
8282
* @define option [[scala.Option]]
@@ -327,7 +327,7 @@ sealed abstract class Option[+A] extends Product with Serializable {
327327
* `A`.
328328
*
329329
* @author Martin Odersky
330-
* @version 1.0, 16/07/2003
330+
* @since 1.0
331331
*/
332332
@SerialVersionUID(1234815782226070388L) // value computed by serialver for 2.11.2, annotation added in 2.11.4
333333
final case class Some[+A](@deprecatedName('x, "2.12.0") value: A) extends Option[A] {
@@ -341,7 +341,7 @@ final case class Some[+A](@deprecatedName('x, "2.12.0") value: A) extends Option
341341
/** This case object represents non-existent values.
342342
*
343343
* @author Martin Odersky
344-
* @version 1.0, 16/07/2003
344+
* @since 1.0
345345
*/
346346
@SerialVersionUID(5066590221178148012L) // value computed by serialver for 2.11.2, annotation added in 2.11.4
347347
case object None extends Option[Nothing] {

library/src/scala/PartialFunction.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ package scala
5050
*
5151
*
5252
* @author Martin Odersky, Pavel Pavlov, Adriaan Moors
53-
* @version 1.0, 16/07/2003
53+
* @since 1.0
5454
*/
5555
trait PartialFunction[-A, +B] extends (A => B) { self =>
5656
import PartialFunction._

library/src/scala/Product.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ package scala
1414
* all case classes implement `Product` with synthetically generated methods.
1515
*
1616
* @author Burak Emir
17-
* @version 1.0
1817
* @since 2.3
1918
*/
2019
trait Product extends Any with Equals {

library/src/scala/Proxy.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package scala
2020
* an asymmetric equals method, which is not generally recommended.
2121
*
2222
* @author Matthias Zenger
23-
* @version 1.0, 26/04/2004
23+
* @since 1.0
2424
*/
2525
trait Proxy extends Any {
2626
def self: Any

library/src/scala/Responder.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ package scala
1313
*
1414
* @author Martin Odersky
1515
* @author Burak Emir
16-
* @version 1.0
1716
*
1817
* @see class Responder
1918
* @since 2.1
@@ -56,7 +55,6 @@ object Responder {
5655
*
5756
* @author Martin Odersky
5857
* @author Burak Emir
59-
* @version 1.0
6058
* @since 2.1
6159
*/
6260
@deprecated("this class will be removed", "2.11.0")

library/src/scala/Symbol.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package scala
1818
* `Symbol("mysym")`.
1919
*
2020
* @author Martin Odersky, Iulian Dragos
21-
* @version 1.8
21+
* @since 1.7
2222
*/
2323
final class Symbol private (val name: String) extends Serializable {
2424
/** Converts this symbol to a string.

library/src/scala/annotation/Annotation.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package scala.annotation
1515
* [[scala.annotation.ClassfileAnnotation]].
1616
*
1717
* @author Martin Odersky
18-
* @version 1.1, 2/02/2007
1918
* @since 2.4
2019
*/
2120
abstract class Annotation {}

library/src/scala/annotation/ClassfileAnnotation.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ package scala.annotation
1313
* in classfiles.
1414
*
1515
* @author Martin Odersky
16-
* @version 1.1, 2/02/2007
1716
* @since 2.4
1817
*/
1918
trait ClassfileAnnotation extends StaticAnnotation

library/src/scala/annotation/StaticAnnotation.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ package scala.annotation
1212
* to the Scala type checker, even across different compilation units.
1313
*
1414
* @author Martin Odersky
15-
* @version 1.1, 2/02/2007
1615
* @since 2.4
1716
*/
1817
trait StaticAnnotation extends Annotation

library/src/scala/annotation/TypeConstraint.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package scala.annotation
2020
* would rewrite a type constraint.
2121
*
2222
* @author Lex Spoon
23-
* @version 1.1, 2007-11-5
2423
* @since 2.6
2524
*/
2625
trait TypeConstraint extends Annotation

library/src/scala/annotation/strictfp.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ package scala.annotation
1212
* the strictfp flag will be emitted.
1313
*
1414
* @author Paul Phillips
15-
* @version 2.9
1615
* @since 2.9
1716
*/
1817
class strictfp extends scala.annotation.StaticAnnotation

library/src/scala/collection/BitSetLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import mutable.StringBuilder
2727
* variable-size arrays of bits packed into 64-bit words. The memory footprint of a bitset is
2828
* determined by the largest number stored in it.
2929
* @author Martin Odersky
30-
* @version 2.8
3130
* @since 2.8
3231
* @define coll bitset
3332
* @define Coll `BitSet`

library/src/scala/collection/BufferedIterator.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package collection
1515
* that inspects the next element without discarding it.
1616
*
1717
* @author Martin Odersky
18-
* @version 2.8
1918
* @since 2.8
2019
*/
2120
trait BufferedIterator[+A] extends Iterator[A] {

library/src/scala/collection/IndexedSeqLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ package collection
2929
* @tparam A the element type of the $coll
3030
* @tparam Repr the type of the actual $coll containing the elements.
3131
* @author Martin Odersky
32-
* @version 2.8
3332
* @since 2.8
3433
* @define willNotTerminateInf
3534
* @define mayNotTerminateInf

library/src/scala/collection/IterableLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import immutable.Stream
3939
* `TraversableLike` by an iterator version.
4040
*
4141
* @author Martin Odersky
42-
* @version 2.8
4342
* @since 2.8
4443
* @tparam A the element type of the collection
4544
* @tparam Repr the type of the actual collection containing the elements.

library/src/scala/collection/IterableProxy.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ package collection
1313
* to a different iterable object.
1414
*
1515
* @author Martin Odersky
16-
* @version 2.8
1716
* @since 2.8
1817
*/
1918
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.3")

library/src/scala/collection/IterableProxyLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import generic._
1919
* all calls to a different Iterable object.
2020
*
2121
* @author Martin Odersky
22-
* @version 2.8
2322
* @since 2.8
2423
*/
2524
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.0")

library/src/scala/collection/IterableViewLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import scala.language.implicitConversions
2121
* All views for iterable collections are defined by re-interpreting the `iterator` method.
2222
*
2323
* @author Martin Odersky
24-
* @version 2.8
2524
* @since 2.8
2625
* @tparam A the element type of the view
2726
* @tparam Coll the type of the underlying collection containing the elements.

library/src/scala/collection/Iterator.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import immutable.Stream
1818
*
1919
* @author Martin Odersky
2020
* @author Matthias Zenger
21-
* @version 2.8
2221
* @since 2.8
2322
*/
2423
object Iterator {
@@ -321,7 +320,6 @@ object Iterator {
321320
* }}}
322321
*
323322
* @author Martin Odersky, Matthias Zenger
324-
* @version 2.8
325323
* @since 1
326324
* @define willNotTerminateInf
327325
* Note: will not terminate for infinite iterators.

library/src/scala/collection/LinearSeqLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import scala.annotation.tailrec
2121
* Linear sequences do not add any new methods to `Seq`, but promise efficient implementations
2222
* of linear access patterns.
2323
* @author Martin Odersky
24-
* @version 2.8
2524
* @since 2.8
2625
*
2726
* @tparam A the element type of the $coll

library/src/scala/collection/MapLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import parallel.ParMap
4747
* @tparam This the type of the map itself.
4848
*
4949
* @author Martin Odersky
50-
* @version 2.8
5150
*
5251
* @define coll map
5352
* @define Coll Map

library/src/scala/collection/MapProxy.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ package collection
1414
* dynamically using object composition and forwarding.
1515
*
1616
* @author Matthias Zenger
17-
* @version 1.0, 21/07/2003
1817
* @since 1
1918
*/
2019
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.3")

library/src/scala/collection/MapProxyLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package collection
1515
* all calls to a different Map object.
1616
*
1717
* @author Martin Odersky
18-
* @version 2.8
1918
* @since 2.8
2019
*/
2120
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.0")

library/src/scala/collection/SeqLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import scala.math.Ordering
4242
*
4343
* @author Martin Odersky
4444
* @author Matthias Zenger
45-
* @version 1.0, 16/07/2003
4645
* @since 2.8
4746
*
4847
* @define Coll `Seq`

library/src/scala/collection/SeqProxy.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package collection
1515
* all calls to a different sequence object.
1616
*
1717
* @author Martin Odersky
18-
* @version 2.8
1918
* @since 2.8
2019
*/
2120
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.0")

library/src/scala/collection/SeqProxyLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import generic._
2020
* all calls to a different sequence.
2121
*
2222
* @author Martin Odersky
23-
* @version 2.8
2423
* @since 2.8
2524
*/
2625
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.0")

library/src/scala/collection/SeqViewLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import Seq.fill
2121
* `apply` methods.
2222
*
2323
* @author Martin Odersky
24-
* @version 2.8
2524
* @since 2.8
2625
* @tparam A the element type of the view
2726
* @tparam Coll the type of the underlying collection containing the elements.

library/src/scala/collection/SetLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import parallel.ParSet
4848
* @tparam This the type of the set itself.
4949
*
5050
* @author Martin Odersky
51-
* @version 2.8
5251
*
5352
* @define coll set
5453
* @define Coll Set

library/src/scala/collection/SetProxy.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package collection
1515
*
1616
* @author Matthias Zenger
1717
* @author Martin Odersky
18-
* @version 2.0, 01/01/2007
18+
* @since 2.0
1919
*/
2020
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.3")
2121
trait SetProxy[A] extends Set[A] with SetProxyLike[A, Set[A]]

library/src/scala/collection/SetProxyLike.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package collection
1515
* all calls to a different set.
1616
*
1717
* @author Martin Odersky
18-
* @version 2.8
18+
* @since 2.8
1919
*/
2020
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.0")
2121
trait SetProxyLike[A, +This <: SetLike[A, This] with Set[A]] extends SetLike[A, This] with IterableProxyLike[A, This] {

library/src/scala/collection/SortedMap.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import mutable.Builder
1616
*
1717
* @author Sean McDirmid
1818
* @author Martin Odersky
19-
* @version 2.8
2019
* @since 2.4
2120
*/
2221
trait SortedMap[A, +B] extends Map[A, B] with SortedMapLike[A, B, SortedMap[A, B]] {

library/src/scala/collection/SortedMapLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import generic._
1717
*
1818
* @author Sean McDirmid
1919
* @author Martin Odersky
20-
* @version 2.8
2120
* @since 2.8
2221
*/
2322
trait SortedMapLike[A, +B, +This <: SortedMapLike[A, B, This] with SortedMap[A, B]] extends Sorted[A, This] with MapLike[A, B, This] {

library/src/scala/collection/SortedSet.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import generic._
1515
*
1616
* @author Sean McDirmid
1717
* @author Martin Odersky
18-
* @version 2.8
1918
* @since 2.4
2019
*/
2120
trait SortedSet[A] extends Set[A] with SortedSetLike[A, SortedSet[A]] {

library/src/scala/collection/SortedSetLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import generic._
1515
*
1616
* @author Sean McDirmid
1717
* @author Martin Odersky
18-
* @version 2.8
1918
* @since 2.8
2019
*/
2120
trait SortedSetLike[A, +This <: SortedSet[A] with SortedSetLike[A, This]] extends Sorted[A, This] with SetLike[A, This] {

library/src/scala/collection/TraversableLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import scala.language.higherKinds
5858
* order they were inserted into the `HashMap`.
5959
*
6060
* @author Martin Odersky
61-
* @version 2.8
6261
* @since 2.8
6362
* @tparam A the element type of the collection
6463
* @tparam Repr the type of the actual collection containing the elements.

library/src/scala/collection/TraversableOnce.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import scala.reflect.ClassTag
2121
*
2222
* @author Martin Odersky
2323
* @author Paul Phillips
24-
* @version 2.8
2524
* @since 2.8
2625
*
2726
* @define coll traversable or iterator

library/src/scala/collection/TraversableProxy.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package collection
1818
* all calls to a different traversable object
1919
*
2020
* @author Martin Odersky
21-
* @version 2.8
2221
* @since 2.8
2322
*/
2423
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.3")

library/src/scala/collection/TraversableProxyLike.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import scala.reflect.ClassTag
2121
* all calls to a different Traversable object.
2222
*
2323
* @author Martin Odersky
24-
* @version 2.8
2524
* @since 2.8
2625
*/
2726
@deprecated("proxying is deprecated due to lack of use and compiler-level support", "2.11.0")

0 commit comments

Comments
 (0)