Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit 8e7e3b4

Browse files
committed
Merge pull request scala#4667 from janekdb/2.11.x-scaladoc-library-library-aux
ScalaDoc fixes for library and library-aux
2 parents 7de4cbc + 69c2c10 commit 8e7e3b4

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

src/library-aux/scala/AnyRef.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ trait AnyRef extends Any {
4545
*/
4646
def synchronized[T](body: => T): T
4747

48-
/** Tests whether the argument (`arg0`) is a reference to the receiver object (`this`).
48+
/** Tests whether the argument (`that`) is a reference to the receiver object (`this`).
4949
*
5050
* The `eq` method implements an [[http://en.wikipedia.org/wiki/Equivalence_relation equivalence relation]] on
5151
* non-null instances of `AnyRef`, and has three additional properties:
@@ -73,7 +73,7 @@ trait AnyRef extends Any {
7373

7474
/** The expression `x == that` is equivalent to `if (x eq null) that eq null else x.equals(that)`.
7575
*
76-
* @param arg0 the object to compare against this object for equality.
76+
* @param that the object to compare against this object for equality.
7777
* @return `true` if the receiver object is equivalent to the argument; `false` otherwise.
7878
*/
7979
final def ==(that: Any): Boolean =

src/library/scala/StringContext.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ object StringContext {
173173
/** An exception that is thrown if a string contains a backslash (`\`) character
174174
* that does not start a valid escape sequence.
175175
* @param str The offending string
176-
* @param idx The index of the offending backslash character in `str`.
176+
* @param index The index of the offending backslash character in `str`.
177177
*/
178178
class InvalidEscapeException(str: String, @deprecatedName('idx) val index: Int) extends IllegalArgumentException(
179179
s"""invalid escape ${

src/library/scala/collection/GenSeqLike.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ trait GenSeqLike[+A, +Repr] extends Any with GenIterableLike[A, Repr] with Equal
274274
* @tparam B the element type of the returned $coll.
275275
* @tparam That $thatinfo
276276
* @param bf $bfinfo
277-
* @return a new $coll` which is a copy of this $coll with the element at position `index` replaced by `elem`.
277+
* @return a new $coll which is a copy of this $coll with the element at position `index` replaced by `elem`.
278278
* @throws IndexOutOfBoundsException if `index` does not satisfy `0 <= index < length`.
279279
*
280280
* @usecase def updated(index: Int, elem: A): $Coll[A]

src/library/scala/collection/immutable/Stream.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ object Stream extends SeqFactory[Stream] {
11901190
def #:::(prefix: Stream[A]): Stream[A] = prefix append tl
11911191
}
11921192

1193-
/** A wrapper method that adds `#::` for cons and `#::: for concat as operations
1193+
/** A wrapper method that adds `#::` for cons and `#:::` for concat as operations
11941194
* to streams.
11951195
*/
11961196
implicit def consWrapper[A](stream: => Stream[A]): ConsWrapper[A] =

src/library/scala/compat/Platform.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object Platform {
4141
* @throws java.lang.ArrayStoreException If either `src` or `dest` are not of type
4242
* [java.lang.Array]; or if the element type of `src` is not
4343
* compatible with that of `dest`.
44-
* @throws java.lang.IndexOutOfBoundsException If either srcPos` or `destPos` are
44+
* @throws java.lang.IndexOutOfBoundsException If either `srcPos` or `destPos` are
4545
* outside of the bounds of their respective arrays; or if `length`
4646
* is negative; or if there are less than `length` elements available
4747
* after `srcPos` or `destPos` in `src` and `dest` respectively.

src/library/scala/math/BigDecimal.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ object BigDecimal {
124124
*/
125125
def exact(s: String): BigDecimal = exact(new BigDec(s))
126126

127-
/** Constructs a 'BigDecimal` that exactly represents the number
127+
/** Constructs a `BigDecimal` that exactly represents the number
128128
* specified in base 10 in a character array.
129129
*/
130130
def exact(cs: Array[Char]): BigDecimal = exact(new BigDec(cs))

src/library/scala/reflect/Manifest.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ object ManifestFactory {
248248
def arrayType[T](arg: Manifest[_]): Manifest[Array[T]] =
249249
arg.asInstanceOf[Manifest[T]].arrayManifest
250250

251-
/** Manifest for the abstract type `prefix # name'. `upperBound` is not
251+
/** Manifest for the abstract type `prefix # name`. `upperBound` is not
252252
* strictly necessary as it could be obtained by reflection. It was
253253
* added so that erasure can be calculated without reflection. */
254254
def abstractType[T](prefix: Manifest[_], name: String, upperBound: Predef.Class[_], args: Manifest[_]*): Manifest[T] =
@@ -269,7 +269,7 @@ object ManifestFactory {
269269
(if (upperBound eq Nothing) "" else " <: "+upperBound)
270270
}
271271

272-
/** Manifest for the intersection type `parents_0 with ... with parents_n'. */
272+
/** Manifest for the intersection type `parents_0 with ... with parents_n`. */
273273
def intersectionType[T](parents: Manifest[_]*): Manifest[T] =
274274
new Manifest[T] {
275275
def runtimeClass = parents.head.runtimeClass

test/scaladoc/resources/doc-root/AnyRef.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ trait AnyRef extends Any {
4545
*/
4646
def synchronized[T](body: => T): T
4747

48-
/** Tests whether the argument (`arg0`) is a reference to the receiver object (`this`).
48+
/** Tests whether the argument (`that`) is a reference to the receiver object (`this`).
4949
*
5050
* The `eq` method implements an [[http://en.wikipedia.org/wiki/Equivalence_relation equivalence relation]] on
5151
* non-null instances of `AnyRef`, and has three additional properties:
@@ -73,7 +73,7 @@ trait AnyRef extends Any {
7373

7474
/** The expression `x == that` is equivalent to `if (x eq null) that eq null else x.equals(that)`.
7575
*
76-
* @param arg0 the object to compare against this object for equality.
76+
* @param that the object to compare against this object for equality.
7777
* @return `true` if the receiver object is equivalent to the argument; `false` otherwise.
7878
*/
7979
final def ==(that: AnyRef): Boolean =

0 commit comments

Comments
 (0)