Skip to content

Commit 8967085

Browse files
committedFeb 4, 2017
Auto merge of #39533 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 3 pull requests - Successful merges: #39486, #39506, #39517 - Failed merges:
2 parents e4eea73 + e204987 commit 8967085

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed
 

Diff for: ‎RELEASES.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Version 1.15.1 (2017-02-07)
2+
===========================
3+
4+
* [Fix IntoIter::as_mut_slice's signature][39466]
5+
6+
[39466]: https://github.com/rust-lang/rust/pull/39466
7+
8+
19
Version 1.15.0 (2017-02-02)
210
===========================
311

Diff for: ‎src/libstd/collections/hash/map.rs

+12-5
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ impl DefaultResizePolicy {
198198
/// attacks such as HashDoS.
199199
///
200200
/// The hashing algorithm can be replaced on a per-`HashMap` basis using the
201-
/// `HashMap::default`, `HashMap::with_hasher`, and
202-
/// `HashMap::with_capacity_and_hasher` methods. Many alternative algorithms
203-
/// are available on crates.io, such as the `fnv` crate.
201+
/// [`HashMap::default`], [`HashMap::with_hasher`], and
202+
/// [`HashMap::with_capacity_and_hasher`] methods. Many alternative algorithms
203+
/// are available on crates.io, such as the [`fnv`] crate.
204204
///
205205
/// It is required that the keys implement the [`Eq`] and [`Hash`] traits, although
206206
/// this can frequently be achieved by using `#[derive(PartialEq, Eq, Hash)]`.
@@ -302,6 +302,10 @@ impl DefaultResizePolicy {
302302
/// [`PartialEq`]: ../../std/cmp/trait.PartialEq.html
303303
/// [`RefCell`]: ../../std/cell/struct.RefCell.html
304304
/// [`Cell`]: ../../std/cell/struct.Cell.html
305+
/// [`HashMap::default`]: #method.default
306+
/// [`HashMap::with_hasher`]: #method.with_hasher
307+
/// [`HashMap::with_capacity_and_hasher`]: #method.with_capacity_and_hasher
308+
/// [`fnv`]: https://crates.io/crates/fnv
305309
///
306310
/// ```
307311
/// use std::collections::HashMap;
@@ -680,7 +684,9 @@ impl<K, V, S> HashMap<K, V, S>
680684
///
681685
/// # Panics
682686
///
683-
/// Panics if the new allocation size overflows `usize`.
687+
/// Panics if the new allocation size overflows [`usize`].
688+
///
689+
/// [`usize`]: ../../std/primitive.usize.html
684690
///
685691
/// # Examples
686692
///
@@ -1141,13 +1147,14 @@ impl<K, V, S> HashMap<K, V, S>
11411147

11421148
/// Inserts a key-value pair into the map.
11431149
///
1144-
/// If the map did not have this key present, `None` is returned.
1150+
/// If the map did not have this key present, [`None`] is returned.
11451151
///
11461152
/// If the map did have this key present, the value is updated, and the old
11471153
/// value is returned. The key is not updated, though; this matters for
11481154
/// types that can be `==` without being identical. See the [module-level
11491155
/// documentation] for more.
11501156
///
1157+
/// [`None`]: ../../std/option/enum.Option.html#variant.None
11511158
/// [module-level documentation]: index.html#insert-and-complex-keys
11521159
///
11531160
/// # Examples

Diff for: ‎src/libstd/sync/condvar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl WaitTimeoutResult {
3636
/// consumes no CPU time while waiting for an event to occur. Condition
3737
/// variables are typically associated with a boolean predicate (a condition)
3838
/// and a mutex. The predicate is always verified inside of the mutex before
39-
/// determining that thread must block.
39+
/// determining that a thread must block.
4040
///
4141
/// Functions in this module will block the current **thread** of execution and
4242
/// are bindings to system-provided condition variables where possible. Note

0 commit comments

Comments
 (0)