From 3c020df3e905f6486fb793a0c41f3ac63f3aa255 Mon Sep 17 00:00:00 2001 From: Son Date: Sat, 4 Feb 2017 00:16:56 +1100 Subject: [PATCH 1/3] tiny doc wording change --- src/libstd/sync/condvar.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index 8ab30c51b282e..5c85c4879a839 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -36,7 +36,7 @@ impl WaitTimeoutResult { /// consumes no CPU time while waiting for an event to occur. Condition /// variables are typically associated with a boolean predicate (a condition) /// and a mutex. The predicate is always verified inside of the mutex before -/// determining that thread must block. +/// determining that a thread must block. /// /// Functions in this module will block the current **thread** of execution and /// are bindings to system-provided condition variables where possible. Note From 2a8ee8c80406c95757f7e27ec81b303e241756f3 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Fri, 3 Feb 2017 22:38:44 +0100 Subject: [PATCH 2/3] Add missing urls in HashMap --- src/libstd/collections/hash/map.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index a314717a8772b..8058972e75093 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -198,9 +198,9 @@ impl DefaultResizePolicy { /// attacks such as HashDoS. /// /// The hashing algorithm can be replaced on a per-`HashMap` basis using the -/// `HashMap::default`, `HashMap::with_hasher`, and -/// `HashMap::with_capacity_and_hasher` methods. Many alternative algorithms -/// are available on crates.io, such as the `fnv` crate. +/// [`HashMap::default`], [`HashMap::with_hasher`], and +/// [`HashMap::with_capacity_and_hasher`] methods. Many alternative algorithms +/// are available on crates.io, such as the [`fnv`] crate. /// /// It is required that the keys implement the [`Eq`] and [`Hash`] traits, although /// this can frequently be achieved by using `#[derive(PartialEq, Eq, Hash)]`. @@ -302,6 +302,10 @@ impl DefaultResizePolicy { /// [`PartialEq`]: ../../std/cmp/trait.PartialEq.html /// [`RefCell`]: ../../std/cell/struct.RefCell.html /// [`Cell`]: ../../std/cell/struct.Cell.html +/// [`HashMap::default`]: #method.default +/// [`HashMap::with_hasher`]: #method.with_hasher +/// [`HashMap::with_capacity_and_hasher`]: #method.with_capacity_and_hasher +/// [`fnv`]: https://crates.io/crates/fnv /// /// ``` /// use std::collections::HashMap; @@ -680,7 +684,9 @@ impl HashMap /// /// # Panics /// - /// Panics if the new allocation size overflows `usize`. + /// Panics if the new allocation size overflows [`usize`]. + /// + /// [`usize`]: ../../std/primitive.usize.html /// /// # Examples /// @@ -1141,13 +1147,14 @@ impl HashMap /// Inserts a key-value pair into the map. /// - /// If the map did not have this key present, `None` is returned. + /// If the map did not have this key present, [`None`] is returned. /// /// If the map did have this key present, the value is updated, and the old /// value is returned. The key is not updated, though; this matters for /// types that can be `==` without being identical. See the [module-level /// documentation] for more. /// + /// [`None`]: ../../std/option/enum.Option.html#variant.None /// [module-level documentation]: index.html#insert-and-complex-keys /// /// # Examples From d650cf5c383aeed222e835009c28901c236820e1 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sat, 4 Feb 2017 01:12:38 +0000 Subject: [PATCH 3/3] Update relnotes for 1.15.1 I already checked this into stable, but it needs to be on master/beta too. --- RELEASES.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 99d6b7709ede9..f26c0b6b61161 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,11 @@ +Version 1.15.1 (2017-02-07) +=========================== + +* [Fix IntoIter::as_mut_slice's signature][39466] + +[39466]: https://github.com/rust-lang/rust/pull/39466 + + Version 1.15.0 (2017-02-02) ===========================