about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-29 17:51:39 +0000
committerbors <bors@rust-lang.org>2014-06-29 17:51:39 +0000
commitcc5663ad55f3dc3a642c8e2c4043900783dcc9f8 (patch)
tree67bde58601aac7f8d59b146dae59fc3a948f53d8 /src/libstd
parentbd9563aa382ccfbda36049786329edcdc609930c (diff)
parentba46c8bf6686f3edf67d8aa7587956e7d5d7375a (diff)
downloadrust-cc5663ad55f3dc3a642c8e2c4043900783dcc9f8.tar.gz
rust-cc5663ad55f3dc3a642c8e2c4043900783dcc9f8.zip
auto merge of #15246 : Sawyer47/rust/rand-doc-fix, r=alexcrichton
Documentation didn't match with parameter name.
Changes name of parameter in docs and function to 'amount'.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rand/mod.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs
index ffe4a94d2a2..f48d487461e 100644
--- a/src/libstd/rand/mod.rs
+++ b/src/libstd/rand/mod.rs
@@ -244,7 +244,7 @@ pub fn random<T: Rand>() -> T {
     task_rng().gen()
 }
 
-/// Randomly sample up to `n` elements from an iterator.
+/// Randomly sample up to `amount` elements from an iterator.
 ///
 /// # Example
 ///
@@ -257,11 +257,11 @@ pub fn random<T: Rand>() -> T {
 /// ```
 pub fn sample<T, I: Iterator<T>, R: Rng>(rng: &mut R,
                                          mut iter: I,
-                                         amt: uint) -> Vec<T> {
-    let mut reservoir: Vec<T> = iter.by_ref().take(amt).collect();
+                                         amount: uint) -> Vec<T> {
+    let mut reservoir: Vec<T> = iter.by_ref().take(amount).collect();
     for (i, elem) in iter.enumerate() {
-        let k = rng.gen_range(0, i + 1 + amt);
-        if k < amt {
+        let k = rng.gen_range(0, i + 1 + amount);
+        if k < amount {
             *reservoir.get_mut(k) = elem;
         }
     }