Skip to content

Commit

Permalink
Auto merge of #39533 - GuillaumeGomez:rollup, r=GuillaumeGomez
Browse files Browse the repository at this point in the history
Rollup of 3 pull requests

- Successful merges: #39486, #39506, #39517
- Failed merges:
  • Loading branch information
bors committed Feb 4, 2017
2 parents e4eea73 + e204987 commit 8967085
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
8 changes: 8 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -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)
===========================

Expand Down
17 changes: 12 additions & 5 deletions src/libstd/collections/hash/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]`.
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -680,7 +684,9 @@ impl<K, V, S> HashMap<K, V, S>
///
/// # Panics
///
/// Panics if the new allocation size overflows `usize`.
/// Panics if the new allocation size overflows [`usize`].
///
/// [`usize`]: ../../std/primitive.usize.html
///
/// # Examples
///
Expand Down Expand Up @@ -1141,13 +1147,14 @@ impl<K, V, S> HashMap<K, V, S>

/// 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
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sync/condvar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8967085

Please sign in to comment.