diff options
author | Seth Tisue <seth@tisue.net> | 2015-09-15 12:28:02 -0400 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2015-09-15 12:28:02 -0400 |
commit | bb52b24bab4482611b0fd8763e500c951e99ea3f (patch) | |
tree | 9aed66cbe113554f07e3ff04625b7b3b4fbd6c3d /src/library | |
parent | e5ae5915dda2c511ca59dd28a32d8834ee3201c0 (diff) | |
parent | 5482294bd8bf743766f114188cfab209ff6274cf (diff) | |
download | scala-bb52b24bab4482611b0fd8763e500c951e99ea3f.tar.gz scala-bb52b24bab4482611b0fd8763e500c951e99ea3f.tar.bz2 scala-bb52b24bab4482611b0fd8763e500c951e99ea3f.zip |
Merge pull request #4738 from janekdb/2.11.x-urls-drifted
Improve drifted URLs
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/AnyVal.scala | 4 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/RedBlackTree.scala | 3 | ||||
-rw-r--r-- | src/library/scala/sys/process/Process.scala | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/library/scala/AnyVal.scala b/src/library/scala/AnyVal.scala index fb3d213e19..e861860196 100644 --- a/src/library/scala/AnyVal.scala +++ b/src/library/scala/AnyVal.scala @@ -48,9 +48,7 @@ package scala * * It's important to note that user-defined value classes are limited, and in some circumstances, * still must allocate a value class instance at runtime. These limitations and circumstances are - * explained in greater detail in the [[http://docs.scala-lang.org/overviews/core/value-classes.html Value Classes Guide]] - * as well as in [[http://docs.scala-lang.org/sips/completed/value-classes.html SIP-15: Value Classes]], - * the Scala Improvement Proposal. + * explained in greater detail in the [[http://docs.scala-lang.org/overviews/core/value-classes.html Value Classes and Universal Traits]]. */ abstract class AnyVal extends Any { def getClass(): Class[_ <: AnyVal] = null diff --git a/src/library/scala/collection/immutable/RedBlackTree.scala b/src/library/scala/collection/immutable/RedBlackTree.scala index 0dad106b29..7e8cfcc902 100644 --- a/src/library/scala/collection/immutable/RedBlackTree.scala +++ b/src/library/scala/collection/immutable/RedBlackTree.scala @@ -168,7 +168,8 @@ object RedBlackTree { } /* Based on Stefan Kahrs' Haskell version of Okasaki's Red&Black Trees - * http://www.cse.unsw.edu.au/~dons/data/RedBlackTree.html */ + * Constructing Red-Black Trees, Ralf Hinze: http://www.cs.ox.ac.uk/ralf.hinze/publications/WAAAPL99b.ps.gz + * Red-Black Trees in a Functional Setting, Chris Okasaki: https://wiki.rice.edu/confluence/download/attachments/2761212/Okasaki-Red-Black.pdf */ private[this] def del[A, B](tree: Tree[A, B], k: A)(implicit ordering: Ordering[A]): Tree[A, B] = if (tree eq null) null else { def balance(x: A, xv: B, tl: Tree[A, B], tr: Tree[A, B]) = if (isRedTree(tl)) { if (isRedTree(tr)) { diff --git a/src/library/scala/sys/process/Process.scala b/src/library/scala/sys/process/Process.scala index dcd06c89e9..c40838bb06 100644 --- a/src/library/scala/sys/process/Process.scala +++ b/src/library/scala/sys/process/Process.scala @@ -155,8 +155,8 @@ trait ProcessCreation { * import java.net.URL * import java.io.File * - * val spde = new URL("http://technically.us/spde/About") - * val dispatch = new URL("http://databinder.net/dispatch/About") + * val spde = new URL("http://technically.us/spde.html") + * val dispatch = new URL("http://dispatch.databinder.net/Dispatch.html") * val build = new File("project/build.properties") * cat(spde, dispatch, build) #| "grep -i scala" ! * }}} |